diff --git a/ANNOUNCE b/ANNOUNCE
index 289608f21..a7b6552d3 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -55,6 +55,7 @@ Version 1.5.7beta02 [November 5, 2011]
     FP exceptions cause a crash. Added code to pngvalid to turn on FP
     exceptions if the appropriate glibc support is there to ensure this is
     tested in the future.
+  Updated scripts/pnglibconf.mak to handle the new PNG_JOIN macro.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index c85a42653..2faa8a27e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3698,6 +3698,7 @@ Version 1.5.7beta02 [November 5, 2011]
     FP exceptions cause a crash. Added code to pngvalid to turn on FP
     exceptions if the appropriate glibc support is there to ensure this is
     tested in the future.
+  Updated scripts/pnglibconf.mak to handle the new PNG_JOIN macro.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/scripts/pnglibconf.mak b/scripts/pnglibconf.mak
index 1509ee242..c65ce2ab5 100755
--- a/scripts/pnglibconf.mak
+++ b/scripts/pnglibconf.mak
@@ -37,7 +37,7 @@ pnglibconf.h: pnglibconf.dfn
 	$(ECHO) "If 'cpp -e' crashes try /lib/cpp (e.g. CPP='/lib/cpp')" >&2
 	$(SED) -n -e 's|^.*PNG_DEFN_MAGIC-\(.*\)-PNG_DEFN_END.*$$|\1|p'\
 	    dfn1.out >dfn2.out
-	$(SED) -e 's| *@@@ *||g' -e 's| *$$||' dfn2.out >dfn3.out
+	$(SED) -e 's| *PNG_JOIN *||g' -e 's| *$$||' dfn2.out >dfn3.out
 	$(COPY) dfn3.out $@
 	$(DELETE) dfn.c dfn1.out dfn2.out dfn3.out