diff --git a/ChangeLog b/ChangeLog
index cc1a6608..4c8ddfee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-03-18  Jay Berkenbilt  <ejb@ql.org>
+
+        * Enhance --optimize-images to support images nested inside of
+        form XObjects. Thanks to Connor Osborne (github user cdosborn) for
+        the contribution. Fixes #923.
+
 2023-02-25  Jay Berkenbilt  <ejb@ql.org>
 
         * 11.3.0: release
diff --git a/TODO b/TODO
index fce507ab..4eba6f6b 100644
--- a/TODO
+++ b/TODO
@@ -263,6 +263,14 @@ Always:
 
 For qpdf 12, see https://github.com/qpdf/qpdf/discussions/785
 
+C++ Version Changes
+===================
+
+Use
+// C++NN: ...
+to mark places in the code that should be updated when we require at
+least that version of C++.
+
 Page splitting/merging
 ======================
 
diff --git a/manual/release-notes.rst b/manual/release-notes.rst
index 904c3e12..39b40ab4 100644
--- a/manual/release-notes.rst
+++ b/manual/release-notes.rst
@@ -8,6 +8,12 @@ For a detailed list of changes, please see the file
 
 .. x.y.z: not yet released
 
+11.4.0: not yet released
+  - CLI Enhancements
+
+    - The :qpdf:ref:`--optimize-images` option now optimizes images
+      inside of form XObjects.
+
 11.3.0: February 25, 2023
   - CLI Enhancements