diff --git a/ANNOUNCE b/ANNOUNCE
index 02f5842e1..2d96ee658 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -41,22 +41,15 @@ Version 1.6.3beta03 [April 30, 2013]
   Avoid dereferencing NULL pointer possibly returned from
      png_create_write_struct() (Andrew Church).
 
-Version 1.6.3beta04 [May 6, 2013]
+Version 1.6.3beta05 [May 9, 2013]
   Calculate our own zlib windowBits when decoding rather than trusting the
     CMF bytes in the PNG datastream.
-
-Version 1.6.3beta05 [May 9, 2013]
-  Choose to use windowBits==15 or the zlib header setting via the
-    benign-errors setting.  If benign errors are allowed, then ignore
-    the windowBits setting in the zlib header.
-  Zlib-1.2.8 and earlier don't allow us to decrease the windowBits, so
-    undid the improvement in beta04.
-  Added an option to force maximum window size for inflating. For inflate,
-    reverted previous fixes.
-  Added fixitxt and pngdeflate to the built programs and removed warnings
-    from the source code and timepng that are revealed as a result.  Fixed
-    fixitxt when the chunk length is more than 65535 (untested, no test case).
-  Detect wrong libpng versions linked to pngdeflate, which currently
+  Added an option to force maximum window size for inflating, which was
+    the behavior of libpng15 and earlier.
+  Added png-fix-itxt and png-fix-too-far-back to the built programs and
+    removed warnings from the source code and timepng that are revealed as
+    a result.
+  Detect wrong libpng versions linked to png-fix-too-far-back, which currently
     only works with libpng versions that can be made to reliably fail when
     the deflate data contains an out-of-window reference.  This means only
     1.6 and later.
@@ -69,13 +62,14 @@ Version 1.6.3beta05 [May 9, 2013]
     Added a call to png_set_packing()
     Initialize dimension values so if sscanf fails at least we have known
       invalid values.
+  Attempt to detect configuration issues with png-fix-too-far-back, which
+    requires both the correct libpng and the correct zlib to function
+    correctly.
+  Check ZLIB_VERNUM for mismatches, enclose #error in quotes
+  Added information in the documentation about problems with and fixes for
+    the bad CRC and bad iTXt chunk situations.
   Attempt to detect configuration issues with pngdeflate, which requires
     both the correct libpng and the correct zlib to function correctly.
-  Check ZLIB_VERNUM for mismatches, enclose #error in quotes
-  Renamed contrib/tools/fixitxt to contrib/tools/png-fix-itxt.
-  Renamed contrib/tools/pnginflate to contrib/tools/png-fix-too-far-back.
-  Added information in the documentation about problems with and fixes for
-  the bad CRC and bad iTXt chunk situations.
 
 Version 1.6.3beta06 [May 9, 2013]
 
diff --git a/CHANGES b/CHANGES
index 682b4d62b..e8fcb9fb3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4524,22 +4524,15 @@ Version 1.6.3beta03 [April 30, 2013]
   Avoid dereferencing NULL pointer possibly returned from
      png_create_write_struct() (Andrew Church).
 
-Version 1.6.3beta04 [May 6, 2013]
+Version 1.6.3beta05 [May 9, 2013]
   Calculate our own zlib windowBits when decoding rather than trusting the
     CMF bytes in the PNG datastream.
-
-Version 1.6.3beta05 [May 9, 2013]
-  Choose to use windowBits==15 or the zlib header setting via the
-    benign-errors setting.  If benign errors are allowed, then ignore
-    the windowBits setting in the zlib header.
-  Zlib-1.2.8 and earlier don't allow us to decrease the windowBits, so
-    undid the improvement in beta04.
-  Added an option to force maximum window size for inflating. For inflate,
-    reverted previous fixes.
-  Added fixitxt and pngdeflate to the built programs and removed warnings
-    from the source code and timepng that are revealed as a result.  Fixed
-    fixitxt when the chunk length is more than 65535 (untested, no test case).
-  Detect wrong libpng versions linked to pngdeflate, which currently
+  Added an option to force maximum window size for inflating, which was
+    the behavior of libpng15 and earlier.
+  Added png-fix-itxt and png-fix-too-far-back to the built programs and
+    removed warnings from the source code and timepng that are revealed as
+    a result.
+  Detect wrong libpng versions linked to png-fix-too-far-back, which currently
     only works with libpng versions that can be made to reliably fail when
     the deflate data contains an out-of-window reference.  This means only
     1.6 and later.
@@ -4552,13 +4545,12 @@ Version 1.6.3beta05 [May 9, 2013]
     Added a call to png_set_packing()
     Initialize dimension values so if sscanf fails at least we have known
       invalid values.
-  Attempt to detect configuration issues with pngdeflate, which requires
-    both the correct libpng and the correct zlib to function correctly.
+  Attempt to detect configuration issues with png-fix-too-far-back, which
+    requires both the correct libpng and the correct zlib to function
+    correctly.
   Check ZLIB_VERNUM for mismatches, enclose #error in quotes
-  Renamed contrib/tools/fixitxt to contrib/tools/png-fix-itxt.
-  Renamed contrib/tools/pnginflate to contrib/tools/png-fix-too-far-back.
   Added information in the documentation about problems with and fixes for
-  the bad CRC and bad iTXt chunk situations.
+    the bad CRC and bad iTXt chunk situations.
 
 Version 1.6.3beta06 [May 9, 2013]