diff --git a/ChangeLog b/ChangeLog
index 379f53ab..21a7f6d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2022-03-07  Jay Berkenbilt  <ejb@ql.org>
+
+	* Minor internal changes to assist with building in other
+	environments: rename internal bits.icc to qpdf/bits_functions.hh
+	(not part of public API), enforce reordering of header files to
+	prevent jpeglib.h from interfering with other headers, remove an
+	unused header that was accidentally added in 10.6.0 but never
+	referenced by any code.
+
+	* Make build work and tests work when NDEBUG is defined. This
+	involved a few changes to some test files but no changes to any
+	library code.
+
 2022-02-25  Jay Berkenbilt  <ejb@ql.org>
 
 	* Bug fix in JSON parser: accept \/ in a string as valid input per
diff --git a/TODO b/TODO
index 96d62a14..41e4d214 100644
--- a/TODO
+++ b/TODO
@@ -3,7 +3,6 @@ Next
 ====
 
 In order:
-* PR #661 (overloaded getters from m-holger)
 * cmake
 * code formatting
 * PointerHolder -> shared_ptr
@@ -284,7 +283,7 @@ When creating output from a string:
 * Else encode as "b:"
 
 When reading a string, any string that doesn't follow the above rules
-is an error. This includes "r:" strings not paresable as a real
+is an error. This includes "r:" strings not parseable as a real
 number, "/Name" strings containing a NUL character, "s:" or "b:"
 strings that are not valid JSON strings, "b:" strings containing
 character values > 0xff, or "e:" values that are not valid base64.
diff --git a/cSpell.json b/cSpell.json
index b85d7b69..4b0b3612 100644
--- a/cSpell.json
+++ b/cSpell.json
@@ -2,6 +2,7 @@
   "version": "0.1",
   "words": [
     "abuild",
+    "dontalign",
     "aclocal",
     "acro",
     "acroform",
@@ -60,7 +61,9 @@
     "cleartext",
     "cloudmersive",
     "clusterfuzz",
+    "cmake",
     "cmatch",
+    "codepoint",
     "coldwind",
     "colorspace",
     "conftest",
@@ -79,6 +82,7 @@
     "decrypter",
     "deduplicating",
     "deps",
+    "deserialization",
     "destdir",
     "dests",
     "devel",
@@ -186,6 +190,7 @@
     "jmap",
     "jmsg",
     "jnull",
+    "jpeglib",
     "jpool",
     "jsamparray",
     "jsample",
@@ -246,6 +251,7 @@
     "mutators",
     "nbsp",
     "ndash",
+    "ndebug",
     "nendstream",
     "nfields",
     "ngrandkids",
diff --git a/manual/release-notes.rst b/manual/release-notes.rst
index d7959b96..64bc49aa 100644
--- a/manual/release-notes.rst
+++ b/manual/release-notes.rst
@@ -6,7 +6,12 @@ Release Notes
 For a detailed list of changes, please see the file
 :file:`ChangeLog` in the source distribution.
 
-10.6.3: XXX
+10.6.3: March 8, 2022
+  - Announcement of upcoming change:
+
+    - qpdf 11 will be built with cmake. The qpdf 11 documentation will
+      include detailed migration instructions.
+
   - Bug fixes:
 
     - Recognize strings explicitly encoded as UTF-8 as allowed by the
@@ -17,6 +22,10 @@ For a detailed list of changes, please see the file
       specifies auto sizing. At this time, qpdf does not support auto
       sizing.
 
+    - Minor, non-functional changes to build and documentation to
+      accommodate a wider range of compilation environments in
+      preparation for migration to cmake.
+
 10.6.2: February 16, 2022
   - Bug fixes: