diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index bcdd2f3..00664b0 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,18 @@
 Changelog for package genjava
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.0.0 (2018-05-14)
+------------------
+* lcas version
+* Merge pull request `#15 <https://github.com/lcas/genjava/issues/15>`_ from jubeira/gradle_3-5-1
+  Gradle update: 3.5.1
+* Using 'doLast' instead of '<<' operator in templates.
+* Gradle update: 3.5.1
+* Merge pull request `#13 <https://github.com/lcas/genjava/issues/13>`_ from meyerj/patch-1
+  Fix non-existent dependency warning for the catkin API (fix `#7 <https://github.com/lcas/genjava/issues/7>`_)
+* Fix non-existent dependency warning for the catkin API (fix `#7 <https://github.com/lcas/genjava/issues/7>`_)
+* Contributors: Johannes Meyer, Juan Ignacio Ubeira, Julian Cerruti, Marc Hanheide
+
 0.3.3 (2017-05-09)
 ------------------
 * Updating message_generation dependency to kinetic range in template to generate messages properly.
diff --git a/package.xml b/package.xml
index 02098f3..4f92dfd 100644
--- a/package.xml
+++ b/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>genjava</name>
-  <version>0.3.3</version>
+  <version>1.0.0</version>
   <description>
     Java ROS message and service generators.
   </description>
@@ -11,7 +11,7 @@
   <url type="repository">https://github.com/rosjava/genjava</url>
   <url type="bugtracker">https://github.com/rosjava/genjava/issues</url>
 
-  <maintainer email="d.stonier@gmail.com">Daniel Stonier</maintainer>
+  <maintainer email="marc@hanheide.net">Marc Hanheide</maintainer>
 
   <author>Daniel Stonier</author>