diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6042bc29bac5143f4cf8bed00dc76009539d517c..96abdb702457a94833973a92a09c47636f2c3b62 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,8 +2,8 @@
 Changelog for package genjava
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Forthcoming
------------
+0.4.0 (2019-04-10)
+------------------
 * Initial Melodic release: updating dependencies to the proper ranges.
 
 0.3.4 (2019-01-23)
diff --git a/package.xml b/package.xml
index a907f61564dd551f07407ef781480fee42f88de9..827064ba02771c4cc1e195dd952b1011408467d0 100644
--- a/package.xml
+++ b/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>genjava</name>
-  <version>0.3.4</version>
+  <version>0.4.0</version>
   <description>
     Java ROS message and service generators.
   </description>