diff --git a/ANNOUNCE b/ANNOUNCE
index 4af973d49..486cb0ba8 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.5.15beta07 - February 22, 2013
+Libpng 1.5.15beta07 - February 23, 2013
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -62,7 +62,9 @@ Version 1.5.15beta06 [February 22, 2013]
     runtime checks
   Updated the INSTALL document.
 
-Version 1.5.15beta07 [February 22, 2013]
+Version 1.5.15beta07 [February 23, 2013]
+  Revised INSTALL to recommend using CPPFLAGS instead of INCLUDES.
+  Revised scripts/makefile.freebsd to respect ZLIBDIR and ZLIBINC.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index dca547de1..d780f971e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4020,7 +4020,9 @@ Version 1.5.15beta06 [February 22, 2013]
     runtime checks
   Updated the INSTALL document.
 
-Version 1.5.15beta07 [February 22, 2013]
+Version 1.5.15beta07 [February 23, 2013]
+  Revised INSTALL to recommend using CPPFLAGS instead of INCLUDES.
+  Revised scripts/makefile.freebsd to respect ZLIBDIR and ZLIBINC.
 
   ===========================================================================
                        NOTICE November 17, 2012:
diff --git a/INSTALL b/INSTALL
index 972a4727e..f98737800 100644
--- a/INSTALL
+++ b/INSTALL
@@ -46,15 +46,14 @@ to have access to the zlib.h and zconf.h include files that
 correspond to the version of zlib that's installed.
 
 If you wish to test with a particular zlib that is not first in the
-standard library search path, put ZLIBLIB, ZLIBINC, INCLUDES, LDFLAGS,
-LIBS, and LD_LIBRARY_PATH in your environment before running "make test"
+standard library search path, put ZLIBLIB, ZLIBINC, CPPFLAGS, LDFLAGS,
+and LD_LIBRARY_PATH in your environment before running "make test"
 or "make distcheck":
 
 ZLIBLIB=/path/to/lib export ZLIBLIB
 ZLIBINC=/path/to/include export ZLIBINC
-INCLUDES="-I$ZLIBINC" export INCLUDES
+CPPFLAGS="-I$ZLIBINC" export CPPFLAGS
 LDFLAGS="-L$ZLIBLIB" export LDFLAGS
-LIBS=$ZLIBLIB/libz.a export LIBS
 LD_LIBRARY_PATH="$ZLIBLIB:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH
 
 If you are using one of the makefile scripts, put ZLIBLIB and ZLIBINC
@@ -67,8 +66,8 @@ If you want to use "cmake" (see www.cmake.org), type
    make install
 
 You can rename the directories that you downloaded (they
-might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.5"
-or "zlib125") so that you have directories called "zlib" and "libpng".
+might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.7"
+or "zlib127") so that you have directories called "zlib" and "libpng".
 
 Your directory structure should look like this:
 
diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd
index 38cd92121..0eb1eeece 100644
--- a/scripts/makefile.freebsd
+++ b/scripts/makefile.freebsd
@@ -26,19 +26,24 @@ SYMLINKS=       libpng/png.h ${INCSDIR}/../png.h \
 		libpng/pngconf.h ${INCSDIR}/../pngconf.h \
 		libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h
 
-LDADD+=         -lm -lz
-#LDADD+=         -lm -lz -lssp_nonshared   # for OSVERSION >= 800000 ?
+# where make install finds libz.a and zlib.h
+ZLIBLIB=	/usr/lib
+ZLIBINC=	/usr/include
+
+LDADD+=        -lm -lz
+#LDADD+=       -lm -lz -lssp_nonshared   # for OSVERSION < 800000 ?
 
 DPADD+=         ${LIBM} ${LIBZ}
 
-CFLAGS+= -I.
+CFLAGS+= -I. -I${ZLIBINC}
 
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c
 
 pngtest: pngtest.o libpng.a
-	${CC} ${CFLAGS} -L. -static -o pngtest pngtest.o -lpng -lz -lm
+	${CC} ${CFLAGS} -L. -static -o pngtest pngtest.o -L${ZLIBLIB} \
+	-lpng ${LDADD}
 
 CLEANFILES= pngtest pngtest.o pngout.png