diff --git a/Changelog.rst b/Changelog.rst
index 76048a7a..1ccf7743 100644
--- a/Changelog.rst
+++ b/Changelog.rst
@@ -3,8 +3,8 @@
 Changelog
 =========
 
-5.4.0 (dev)
------------
+5.4.0 (2017-05-18)
+------------------
 
  * ``bulk`` helpers now extract ``pipeline`` parameter from the action
    dictionary.
diff --git a/elasticsearch/__init__.py b/elasticsearch/__init__.py
index b2d32f1b..2f366e36 100644
--- a/elasticsearch/__init__.py
+++ b/elasticsearch/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-VERSION = (5, 3, 0)
+VERSION = (5, 4, 0)
 __version__ = VERSION
 __versionstr__ = '.'.join(map(str, VERSION))
 
diff --git a/setup.py b/setup.py
index c7ee433a..2444483c 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from os.path import join, dirname
 from setuptools import setup, find_packages
 import sys
 
-VERSION = (5, 3, 0)
+VERSION = (5, 4, 0)
 __version__ = VERSION
 __versionstr__ = '.'.join(map(str, VERSION))