diff --git a/Makefile.am b/Makefile.am
index 9aea5a600..8d0f7a9c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,7 +82,8 @@ lib_LTLIBRARIES=libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
 libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngerror.c\
 	pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c pngrutil.c\
 	pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c\
-	png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h pngusr.dfa
+	png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h pngchunk.h \
+	pngusr.dfa
 
 # Include libpng extensions, if appropriate.  This uses a Makefile.am fragment,
 # pre-set things that might be changed by addition:
@@ -285,7 +286,7 @@ scripts/pnglibconf.c: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
 	rm pnglibconf.tf6
 	mv pnglibconf.tf7 $@
 
-$(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS): png.h pngconf.h \
+$(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS): png.h pngconf.h pngchunk.h \
 	pnglibconf.h pngpriv.h pngdebug.h pnginfo.h pngstruct.h pngprefix.h
 
 test: check-am
diff --git a/scripts/chunkdesc.h b/pngchunk.h
similarity index 89%
rename from scripts/chunkdesc.h
rename to pngchunk.h
index e3deab6b4..b3463b95a 100644
--- a/scripts/chunkdesc.h
+++ b/pngchunk.h
@@ -1,4 +1,12 @@
-/* PNG CHUNK DESCRIPTIONS.
+
+/* pngchunk.h - PNG chunk descriptions
+ *
+ * Last changed in libpng 1.7.0 [(PENDING RELEASE)]
+ * Copyright (c) 2015 Glenn Randers-Pehrson
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
  *
  * If this list is changed in any way scripts/chunkhash.c must be rebuilt and
  * run to regenerate the lookup functions for the tables described from this
diff --git a/pngrutil.c b/pngrutil.c
index 6e6f643ae..dafd6f47e 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -2706,7 +2706,7 @@ png_known_chunks[] =
 #define after_PLTE   (after_start+PNG_HAVE_PLTE)  /* NOTE: PLTE optional */
 #define after_IDAT   (after_PLTE+PNG_AFTER_IDAT)  /* NOTE: PLTE optional */
 
-/* See scripts/chunkdesc.h for how this works: */
+/* See pngchunk.h for how this works: */
 #define PNG_CHUNK_END(n, c1, c2, c3, c4, before, after)\
    { png_handle_ ## n, png_ ##n, before, after }
 #define PNG_CHUNK(n, c1, c2, c3, c4, before, after)\
@@ -2714,7 +2714,7 @@ png_known_chunks[] =
 #define PNG_CHUNK_BEGIN(n, c1, c2, c3, c4, before, after)\
    PNG_CHUNK_END(n, c1, c2, c3, c4, before, after),
 {
-#  include "scripts/chunkdesc.h"
+#  include "pngchunk.h"
 };
 #undef PNG_CHUNK_START
 #undef PNG_CHUNK
@@ -2723,7 +2723,7 @@ png_known_chunks[] =
 #define C_KNOWN ((sizeof png_known_chunks)/(sizeof png_known_chunks[0]))
 
 /* See: scripts/chunkhash.c for code to generate this.  This reads the same
- * description file (scripts/chunkdesc.h) as is included above.  Whenever
+ * description file (pngchunk.h) as is included above.  Whenever
  * that file is changed chunkhash needs to be re-run to generate the lines
  * following this comment.
  *