diff --git a/ANNOUNCE b/ANNOUNCE
index e63396ab4..4714eb9b7 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.4.0beta94 - November 7, 2009
+Libpng 1.4.0beta94 - November 8, 2009
 
 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.
@@ -634,9 +634,10 @@ version 1.4.0beta93 [November 7, 2009]
   Moved the synopsis lines for png_read_destroy(), png_write_destroy()
     png_debug(), png_debug1(), and png_debug2() from libpng.3 to libpngpf.3.
 
-version 1.4.0beta94 [November 7, 2009]
+version 1.4.0beta94 [November 8, 2009]
   Removed the obsolete, unused pnggccrd.c and pngvcrd.c files.
   Updated CMakeLists.txt to add "-DPNG_CONFIGURE_LIBPNG" to the definitions.
+  Removed dependency of pngtest.o on pngpriv.h in the makefiles.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 61a21e38f..6d152112c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2320,9 +2320,10 @@ version 1.4.0beta93 [November 7, 2009]
   Moved the synopsis lines for png_read_destroy(), png_write_destroy()
     png_debug(), png_debug1(), and png_debug2() from libpng.3 to libpngpf.3.
 
-version 1.4.0beta94 [November 7, 2009]
+version 1.4.0beta94 [November 8, 2009]
   Removed the obsolete, unused pnggccrd.c and pngvcrd.c files.
   Updated CMakeLists.txt to add "-DPNG_CONFIGURE_LIBPNG" to the definitions.
+  Removed dependency of pngtest.o on pngpriv.h in the makefiles.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/scripts/descrip.mms b/scripts/descrip.mms
index 30fb1cffd..d0642c034 100644
--- a/scripts/descrip.mms
+++ b/scripts/descrip.mms
@@ -49,4 +49,4 @@ pngwrite.obj : png.h, pngconf.h, pngpriv.h
 pngwtran.obj : png.h, pngconf.h, pngpriv.h
 pngwutil.obj : png.h, pngconf.h, pngpriv.h
 
-pngtest.obj : png.h, pngconf.h, pngpriv.h
+pngtest.obj : png.h, pngconf.h
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 72e2df195..6983bbf8c 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -113,4 +113,4 @@ pngwrite$(O): png.h pngconf.h pngpriv.h
 pngwtran$(O): png.h pngconf.h pngpriv.h
 pngwutil$(O): png.h pngconf.h pngpriv.h
 
-pngtest$(O):  png.h pngconf.h pngpriv.h
+pngtest$(O):  png.h pngconf.h
diff --git a/scripts/makefile.bc32 b/scripts/makefile.bc32
index 29d7686c9..9e85f13a1 100644
--- a/scripts/makefile.bc32
+++ b/scripts/makefile.bc32
@@ -124,7 +124,7 @@ pngwio.obj: pngwio.c png.h pngconf.h pngpriv.h
 pngwrite.obj: pngwrite.c png.h pngconf.h pngpriv.h
 pngwtran.obj: pngwtran.c png.h pngconf.h pngpriv.h
 pngwutil.obj: pngwutil.c png.h pngconf.h pngpriv.h
-pngtest.obj: pngtest.c png.h pngconf.h pngpriv.h
+pngtest.obj: pngtest.c png.h pngconf.h
 
 $(LIBNAME): $(OBJS)
 	-del $(LIBNAME)
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 0723f7862..2dbf3b1f0 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -227,4 +227,4 @@ pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h
 pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h
 pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h
 
-pngtest.o: png.h pngconf.h pngpriv.h
+pngtest.o: png.h pngconf.h
diff --git a/scripts/makefile.bor b/scripts/makefile.bor
index 696f8efe1..8029dbed8 100644
--- a/scripts/makefile.bor
+++ b/scripts/makefile.bor
@@ -139,7 +139,7 @@ $(LIBNAME): $(OBJS)
 $(LIBOBJS), libpng$(MODEL)
 |
 
-pngtest$(MODEL).obj: pngtest.c
+pngtest$(MODEL).obj: pngtest.c png.h pngconf.h
 	$(CC) $(CFLAGS) -opngtest$(MODEL) -c pngtest.c
 
 pngtest$(MODEL).exe: pngtest$(MODEL).obj
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 78675a728..78f759b3f 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -286,8 +286,8 @@ pngwtran.o pngwtran.pic.o:	png.h pngconf.h pngpriv.h pngwtran.c
 pngwutil.o pngwutil.pic.o:	png.h pngconf.h pngpriv.h pngwutil.c
 pngpread.o pngpread.pic.o:	png.h pngconf.h pngpriv.h pngpread.c
 
-pngtest.o:			png.h pngconf.h pngpriv.h pngtest.c
-pngtest-stat.o:			png.h pngconf.h pngpriv.h pngtest.c
+pngtest.o:			png.h pngconf.h
+pngtest-stat.o:			png.h pngconf.h
 
 
 
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 9258588ee..95b437d67 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -234,4 +234,4 @@ pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h
 pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h
 pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h
 
-pngtest.o: png.h pngconf.h pngpriv.h
+pngtest.o: png.h pngconf.h
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index df9c8ad2d..d86752d68 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -214,4 +214,4 @@ pngwtran.o: png.h pngconf.h pngpriv.h
 pngwutil.o: png.h pngconf.h pngpriv.h
 pngpread.o: png.h pngconf.h pngpriv.h
 
-pngtest.o: png.h pngconf.h pngpriv.h
+pngtest.o: png.h pngconf.h
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index c4662e92d..478b591cd 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -276,4 +276,4 @@ pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h
 pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h
 pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h
 
-pngtest.o: png.h pngconf.h pngpriv.h
+pngtest.o: png.h pngconf.h
diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd
index 2f2f1dda6..0f1e337f8 100644
--- a/scripts/makefile.freebsd
+++ b/scripts/makefile.freebsd
@@ -6,7 +6,7 @@
 # and license in png.h
 
 PREFIX?=        /usr/local
-SHLIB_VER?=     %SONUM%
+SHLIB_VER?=     14
 
 LIB=		png
 SHLIB_MAJOR=	${SHLIB_VER}
diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc
index ac53601aa..f1aa61802 100644
--- a/scripts/makefile.gcc
+++ b/scripts/makefile.gcc
@@ -80,4 +80,4 @@ pngwrite$(O): png.h pngconf.h pngpriv.h
 pngwtran$(O): png.h pngconf.h pngpriv.h
 pngwutil$(O): png.h pngconf.h pngpriv.h
 
-pngtest$(O):  png.h pngconf.h pngpriv.h
+pngtest$(O):  png.h pngconf.h
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 3e32d482c..a8521ac86 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -236,4 +236,4 @@ pngwtran.o: png.h pngconf.h pngpriv.h
 pngwutil.o: png.h pngconf.h pngpriv.h
 pngpread.o: png.h pngconf.h pngpriv.h
 
-pngtest.o: png.h pngconf.h pngpriv.h
+pngtest.o: png.h pngconf.h
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index ebfc0a880..4694372a7 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -245,4 +245,4 @@ pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h
 pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h
 pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h
 
-pngtest.o: png.h pngconf.h pngpriv.h
+pngtest.o: png.h pngconf.h
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index d40c0d9ea..2ca6fedd6 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -233,4 +233,4 @@ pngwtran.o: png.h pngconf.h pngpriv.h
 pngwutil.o: png.h pngconf.h pngpriv.h
 pngpread.o: png.h pngconf.h pngpriv.h
 
-pngtest.o: png.h pngconf.h pngpriv.h
+pngtest.o: png.h pngconf.h
diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc
index 7232d8fbb..ace5f6231 100644
--- a/scripts/makefile.ibmc
+++ b/scripts/makefile.ibmc
@@ -74,4 +74,4 @@ pngwrite$(O): png.h pngconf.h pngpriv.h
 pngwtran$(O): png.h pngconf.h pngpriv.h
 pngwutil$(O): png.h pngconf.h pngpriv.h
 
-pngtest$(O):  png.h pngconf.h pngpriv.h
+pngtest$(O):  png.h pngconf.h
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 52af651df..9aa41ebfa 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -250,4 +250,4 @@ pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h
 pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h
 pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h
 
-pngtest.o: png.h pngconf.h pngpriv.h
+pngtest.o: png.h pngconf.h
diff --git a/scripts/makefile.msc b/scripts/makefile.msc
index 7fdc37fc5..212c38f71 100644
--- a/scripts/makefile.msc
+++ b/scripts/makefile.msc
@@ -78,7 +78,7 @@ libpng.lib: $(OBJS1) $(OBJS2) $(OBJS3)
 	lib libpng $(OBJS2);
 	lib libpng $(OBJS3);
 
-pngtest$(O): png.h pngconf.h pngpriv.h
+pngtest$(O): png.h pngconf.h
 	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
 
 pngtest.exe: pngtest.obj libpng.lib
diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx
index 16d471567..2cf4bfbf1 100644
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -251,4 +251,4 @@ pngwtran.o pngwtran.pic.o:	png.h pngconf.h pngpriv.h pngwtran.c
 pngwutil.o pngwutil.pic.o:	png.h pngconf.h pngpriv.h pngwutil.c
 pngpread.o pngpread.pic.o:	png.h pngconf.h pngpriv.h pngpread.c
 
-pngtest.o:			png.h pngconf.h pngpriv.h pngtest.c
+pngtest.o:			png.h pngconf.h pngtest.c
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 2d7cc8e73..ab775b1ca 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -229,4 +229,4 @@ pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h
 pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h
 pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h
 
-pngtest.o: png.h pngconf.h pngpriv.h
+pngtest.o: png.h pngconf.h
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index b5ac976ba..ec62d9a22 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -240,4 +240,4 @@ pngwtran.o: png.h pngconf.h pngpriv.h
 pngwutil.o: png.h pngconf.h pngpriv.h
 pngpread.o: png.h pngconf.h pngpriv.h
 
-pngtest.o: png.h pngconf.h pngpriv.h
+pngtest.o: png.h pngconf.h
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 8f6e34aa4..91b73c207 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -244,4 +244,4 @@ pngwtran.o: png.h pngconf.h pngpriv.h
 pngwutil.o: png.h pngconf.h pngpriv.h
 pngpread.o: png.h pngconf.h pngpriv.h
 
-pngtest.o: png.h pngconf.h pngpriv.h
+pngtest.o: png.h pngconf.h
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index d3e813d09..f4aa476d9 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -251,4 +251,4 @@ pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h
 pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h
 pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h
 
-pngtest.o: png.h pngconf.h pngpriv.h
+pngtest.o: png.h pngconf.h
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index e9eff42e0..1c6a646c6 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -248,4 +248,4 @@ pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h
 pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h
 pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h
 
-pngtest.o: png.h pngconf.h pngpriv.h
+pngtest.o: png.h pngconf.h
diff --git a/scripts/makefile.tc3 b/scripts/makefile.tc3
index ecce8be0e..eb5616952 100644
--- a/scripts/makefile.tc3
+++ b/scripts/makefile.tc3
@@ -63,7 +63,7 @@ pngrio$(O): png.h pngconf.h pngpriv.h
 pngwio$(O): png.h pngconf.h pngpriv.h
 	$(CC) -c $(CFLAGS) $*.c
 
-pngtest$(O): png.h pngconf.h pngpriv.h
+pngtest$(O): png.h pngconf.h
 	$(CC) -c $(CFLAGS) $*.c
 
 pngtrans$(O): png.h pngconf.h pngpriv.h
diff --git a/scripts/makefile.vcawin32 b/scripts/makefile.vcawin32
index 7b65a6b6a..d2804495b 100644
--- a/scripts/makefile.vcawin32
+++ b/scripts/makefile.vcawin32
@@ -84,7 +84,7 @@ libpng.lib: $(OBJS)
 	-$(RM) $@
 	$(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE)
 
-pngtest$(O): png.h pngconf.h pngpriv.h
+pngtest$(O): png.h pngconf.h
 	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
 
 pngtest.exe: pngtest$(O) libpng.lib
diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32
index 38367091f..15a377ee5 100644
--- a/scripts/makefile.vcwin32
+++ b/scripts/makefile.vcwin32
@@ -84,7 +84,7 @@ libpng.lib: $(OBJS)
 	-$(RM) $@
 	$(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE)
 
-pngtest$(O): png.h pngconf.h pngpriv.h
+pngtest$(O): png.h pngconf.h
 	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
 
 pngtest.exe: pngtest$(O) libpng.lib
diff --git a/scripts/makefile.watcom b/scripts/makefile.watcom
index fee677841..228261d51 100644
--- a/scripts/makefile.watcom
+++ b/scripts/makefile.watcom
@@ -82,7 +82,7 @@ pngrio$(O): png.h pngconf.h pngpriv.h
 pngwio$(O): png.h pngconf.h pngpriv.h
 	$(CC) $(CFLAGS) $*.c $(ERRFILE)
 
-pngtest$(O): png.h pngconf.h pngpriv.h
+pngtest$(O): png.h pngconf.h
 	$(CC) $(CFLAGS) $*.c $(ERRFILE)
 
 pngtrans$(O): png.h pngconf.h pngpriv.h