diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a3709d4e..aa068c15 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,8 +2,8 @@
 Changelog for package catkin_tools
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Forthcoming
------------
+0.4.0 (2016-04-18)
+------------------
 * Major refactor of the job execution engine to use Trollius/Asyncio.
   * Changed the way build environments are generated (no more ``build.sh``).
 * Added new "Linked-devel" space option, where the ``devel`` space for each package is isolated, but are symlinked to a single merged ``devel`` space afterwards.
diff --git a/setup.py b/setup.py
index a2e8de9d..1ae36aa4 100644
--- a/setup.py
+++ b/setup.py
@@ -106,7 +106,7 @@ def run(self):
 
 setup(
     name='catkin_tools',
-    version='0.3.1',
+    version='0.4.0',
     packages=find_packages(exclude=['tests', 'docs']),
     package_data={
         'catkin_tools': [