diff --git a/rmw_implementation/CHANGELOG.rst b/rmw_implementation/CHANGELOG.rst
index b762654..65d6b82 100644
--- a/rmw_implementation/CHANGELOG.rst
+++ b/rmw_implementation/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package rmw_implementation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Forthcoming
+-----------
+* Add mechanism to disable workaround for dependency groups (`#229 <https://github.com/ros2/rmw_implementation/issues/229>`_)
+* Contributors: Scott K Logan
+
 2.16.0 (2024-04-26)
 -------------------
 * Update quality declaration document (`#225 <https://github.com/ros2/rmw_implementation/issues/225>`_)
diff --git a/test_rmw_implementation/CHANGELOG.rst b/test_rmw_implementation/CHANGELOG.rst
index 888dafc..f054930 100644
--- a/test_rmw_implementation/CHANGELOG.rst
+++ b/test_rmw_implementation/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog for package test_rmw_implementation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Forthcoming
+-----------
+* Expect rmw_service_server_is_available to ret RMW_RET_INVALID_ARGUMENT (`#231 <https://github.com/ros2/rmw_implementation/issues/231>`_)
+* Expect rmw_destroy_wait_set to ret RMW_RET_INVALID_ARGUMENT (`#234 <https://github.com/ros2/rmw_implementation/issues/234>`_)
+* Add test creating two content filter topics with the same topic name (`#230 <https://github.com/ros2/rmw_implementation/issues/230>`_) (`#233 <https://github.com/ros2/rmw_implementation/issues/233>`_)
+* Contributors: Alejandro Hernández Cordero, Christophe Bedard
+
 2.16.0 (2024-04-26)
 -------------------