diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d4650977..e02c7159 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,26 @@
 Changelog for package control_toolbox
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Forthcoming
+-----------
+* Refactor the Pid class to be completely ROS agnostic and added a ROS 2 wrapper
+* Avoid crash when the type of the parameter doesn't match
+* Added topic_prefix to publisher topic name (`#95 <https://github.com/ros-controls/control_toolbox/issues/95>`_)
+* Created a shared library (`#93 <https://github.com/ros-controls/control_toolbox/issues/93>`_)
+* Aliases not part of the public API are now private
+* Removing pid_gains_setter
+* Removed unnecessary dependencies
+* Cleared empty non virtual destructors
+* Removed unused limited proxy variables
+* Added pid state real-time publisher
+* Removed all references to tinyxml
+* Removed tune_pid.py
+* Adding missing copyright licenses
+* Adapted dither, sine_sweep and sinusoid to ROS2
+* Removed dynamic reconfigure completely
+* Removed deprecated functions
+* Contributors: Alejandro Hernández Cordero, Bence Magyar, James Xu, Jordan Palacios, Shane Loretz, ahcorde
+
 1.17.0 (2019-01-31)
 -------------------
 * update anti windup clamping