diff --git a/CHANGES.rst b/CHANGES.rst
index 2fc6d8dd..8803b94b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,11 @@
-2.4.0 (Unreleased)
+2.4.0 (2017-02-14)
 ==================
 - [NEW] Added ``timeout`` option to the client constructor for setting a timeout on a HTTP connection or a response.
+- [NEW] Added ``cloudant_bluemix`` method to the Cloudant client allowing service credentials to be passed using the CloudFoundry VCAP_SERVICES environment variable.
+- [IMPROVED] Updated non-response related errors with additional status code and improved error message for easier debugging.
+  All non-response error are handled using either CloudantException or CloudantArgumentError.
+- [FIXED] Support ``long`` type argument when executing in Python 2.
+
 
 2.3.1 (2016-11-30)
 ==================
diff --git a/docs/conf.py b/docs/conf.py
index 6d31ecac..b3791af1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.4.0.dev'
+version = '2.4.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.4.0.dev'
+release = '2.4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index b7dfa2fe..6bb5970e 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@
     'include_package_data': True,
     'install_requires': requirements,
     'name': 'cloudant',
-    'version': '2.4.0.dev',
+    'version': '2.4.0',
     'author': 'IBM',
     'author_email': 'alfinkel@us.ibm.com',
     'url': 'https://github.com/cloudant/python-cloudant',
diff --git a/src/cloudant/__init__.py b/src/cloudant/__init__.py
index caed5585..c2a6caab 100644
--- a/src/cloudant/__init__.py
+++ b/src/cloudant/__init__.py
@@ -15,7 +15,7 @@
 """
 Cloudant / CouchDB Python client library API package
 """
-__version__ = '2.4.0.dev'
+__version__ = '2.4.0'
 
 # pylint: disable=wrong-import-position
 import contextlib