diff --git a/README b/README
index 6bf6f91eb637318a82ec61f8922d226abee6afb1..1d60b183a8bbfc3481be86cf204c51b0c676ce84 100644
--- a/README
+++ b/README
@@ -35,7 +35,7 @@ along with Execo.  If not, see <http://www.gnu.org/licenses/>
 Versions
 ========
 
-latest stable version: v2.5.3 (2016-01-25)
+latest stable version: v2.5.4 (2016-05-03)
 
 Installation instructions
 =========================
diff --git a/debian/changelog b/debian/changelog
index 9debf839a8f860d13219af56fcc6baac8e063e34..d9bb505de3c8deafc29f809eb410b816399435df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+python-execo (2.5.4) unstable; urgency=low
+
+  * new upstream release:
+
+    - execo_g5k.topology: fix wrong log template causing crash, log messages, documentation
+
+    - execo_g5k.planning: handle oar queues in planning
+
+    - execo_g5k.charter: fix bad sql results indexing causing crash
+
+    - make execo / execo_g5k runnable with void environment (no $HOME)
+
+    - execo.process: important optimization: bypass heavy string processing of iodebug logger when possible
+
+ -- Matthieu Imbert <matthieu.imbert@inria.fr>  Tue, 3 May 2016 17:00:00 +0200
+
 python-execo (2.5.3) unstable; urgency=low
 
   * new upstream release:
diff --git a/doc/userguide.rst b/doc/userguide.rst
index e0621209897e60f86a1aed9dfbca48dc7a7ec1d8..fea4ee962c6d8c7f1f275bab355a189aec1d3b02 100644
--- a/doc/userguide.rst
+++ b/doc/userguide.rst
@@ -18,9 +18,9 @@ with packages managed by your distribution package manager.
 
 - Install from a release tar.gz package::
 
-   $ wget http://execo.gforge.inria.fr/downloads/execo-2.5.3.tar.gz
-   $ tar xzf execo-2.5.3.tar.gz
-   $ cd execo-2.5.3/
+   $ wget http://execo.gforge.inria.fr/downloads/execo-2.5.4.tar.gz
+   $ tar xzf execo-2.5.4.tar.gz
+   $ cd execo-2.5.4/
    $ python setup.py install --user
 
 - Or install from source repository if you want the very latest
@@ -45,7 +45,7 @@ with packages managed by your distribution package manager.
 
 - Or install from debian package::
 
-   $ dpkg -i python-execo_2.5.3_all.deb
+   $ dpkg -i python-execo_2.5.4_all.deb
 
 Configuration
 =============