diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4e505939f863b74681a151ecc4ae7a5b3a049c63..c3e116c1b69ec8bd9ccbc5722e2a5d3af7ec6914 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package genjava
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Forthcoming
+-----------
+* Fix bug package directory path, cherry-picked from kinetic
+* Added a more descriptive and helpful error message when a required package is not found in the mesasge package index.
+* Contributors: Daniel Stonier, Julian Cerruti, Martin Pecka, Perrine Aguiar
+
 0.1.4 (2015-03-01)
 ------------------
 * generate_rosjava_messages cmake api needs the rosjava environment.