diff --git a/Makefile.am b/Makefile.am
index a9457257c197a56331ac6bdb514ef94b277e0e19..8711c4fad6202ce02d8513aa2c881227ab95fd06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngset.c pngget.c pngrutil
 	pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c \
-	png.h pngconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+	png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
 
 nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h
 
diff --git a/Makefile.in b/Makefile.in
index a3f9a6d5f4002992d25df2ba182d6524a781c454..c6f741ac4c3a4f714cd202dab792874eae89e956 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -320,7 +320,7 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngset.c pngget.c pngrutil
 	pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c \
-	png.h pngconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+	png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
 
 nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h
 libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_CPPFLAGS = @LIBPNG_DEFINES@
diff --git a/contrib/pngminim/decoder/makefile b/contrib/pngminim/decoder/makefile
index 577a5f452c669092be6ab42497325c6469341777..36334efbb241cd6822cc8af7926182a0aca6de0d 100644
--- a/contrib/pngminim/decoder/makefile
+++ b/contrib/pngminim/decoder/makefile
@@ -25,7 +25,7 @@ OBJS  = pngm2pnm$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
 
 # implicit make rules -------------------------------------------------------
 
-.c$(O): png.h pngconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngusr.h zlib.h
+.c$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h  pngusr.h zlib.h
 	$(CC) -c $(CFLAGS) $<
 
 # dependencies
diff --git a/contrib/pngminim/encoder/makefile b/contrib/pngminim/encoder/makefile
index e504d66d11aa04692a4b2460d7ed60b24df02bf5..0c7ccbf36cb92e94e5994706b23cd6d645c5800c 100644
--- a/contrib/pngminim/encoder/makefile
+++ b/contrib/pngminim/encoder/makefile
@@ -24,7 +24,7 @@ OBJS  = pnm2pngm$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
 
 # implicit make rules -------------------------------------------------------
 
-.c$(O): png.h pngconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h pngusr.h zlib.h
+.c$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h  pngusr.h zlib.h
 	$(CC) -c $(CFLAGS) $<
 
 # dependencies
diff --git a/contrib/pngminim/preader/makefile b/contrib/pngminim/preader/makefile
index dca09a24869fc3b5cd771d1ed615354307406ffa..9b2ad253feaaa514c747c660adf61cb8921aa324 100644
--- a/contrib/pngminim/preader/makefile
+++ b/contrib/pngminim/preader/makefile
@@ -41,7 +41,7 @@ OBJS  = rpng2-x$(O) readpng2$(O) png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
 
 # implicit make rules -------------------------------------------------------
 
-.c$(O): png.h pngconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h readpng2.h pngusr.h zlib.h
+.c$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h  readpng2.h pngusr.h zlib.h
 	$(CC) -c $(CFLAGS) $<
 
 # dependencies