diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2af0789..fecbd71 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package laser_geometry
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Forthcoming
+-----------
+* Fix segfault when laserscan ranges[] is empty
+* Contributors: Timm Linder, Vincent Rabaud
+
 1.6.3 (2015-03-07)
 ------------------
 * provide support for tf2