diff --git a/ANNOUNCE b/ANNOUNCE
index 39a6813..8f4c737 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -109,8 +109,8 @@
   Revised example.c to illustrate use of PNG_DEFAULT_sRGB and PNG_GAMMA_MAC_18
     as parameters for png_set_gamma().  These have been available since
     libpng-1.5.4.
-  Revised contrib/tools/png-fix-too-far-back.c to check all compressed chunks
-    known to libpng.
+  Renamed contrib/tools/png-fix-too-far-back.c to pngfix.c and revised it
+    to check all compressed chunks known to libpng.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index ac041df..159a0c3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4593,8 +4593,8 @@
   Revised example.c to illustrate use of PNG_DEFAULT_sRGB and PNG_GAMMA_MAC_18
     as parameters for png_set_gamma().  These have been available since
     libpng-1.5.4.
-  Revised contrib/tools/png-fix-too-far-back.c to check all compressed chunks
-    known to libpng.
+  Renamed contrib/tools/png-fix-too-far-back.c to pngfix.c and revised it
+    to check all compressed chunks known to libpng.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/Makefile.am b/Makefile.am
index 8ee89a9..74a33e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@
 check_PROGRAMS= pngtest pngunknown pngstest pngvalid
 
 # Utilities - installed
-bin_PROGRAMS= png-fix-too-far-back png-fix-itxt
+bin_PROGRAMS= pngfix png-fix-itxt
 
 pngtest_SOURCES = pngtest.c
 pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
@@ -24,8 +24,8 @@
 pngunknown_SOURCES = contrib/libtests/pngunknown.c
 pngunknown_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
 
-png_fix_too_far_back_SOURCES = contrib/tools/png-fix-too-far-back.c
-png_fix_too_far_back_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
+pngfix_SOURCES = contrib/tools/pngfix.c
+pngfix_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
 
 png_fix_itxt_SOURCES = contrib/tools/png-fix-itxt.c
 
@@ -196,7 +196,7 @@
 # an installed one (this can happen immediately after on a clean system if
 # 'make test' is the first thing the user does.)
 pngstest.o pngvalid.o pngtest.o pngunknown.o timepng.o: pnglibconf.h
-png-fix-too-far-back.o png-fix-itxt.o: pnglibconf.h
+pngfix.o png-fix-itxt.o: pnglibconf.h
 
 # We must use -DPNG_NO_USE_READ_MACROS here even when the library may actually
 # be built with PNG_USE_READ_MACROS; this prevents the read macros from
diff --git a/contrib/tools/png-fix-too-far-back.c b/contrib/tools/pngfix.c
similarity index 100%
rename from contrib/tools/png-fix-too-far-back.c
rename to contrib/tools/pngfix.c