diff --git a/ANNOUNCE b/ANNOUNCE
index a43ff0fac..b48345c9e 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.5.11beta01 - April 24, 2012
+Libpng 1.5.11beta01 - April 26, 2012
 
 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.
@@ -26,7 +26,7 @@ Other information:
 
 Changes since the last public release (1.5.10):
 
-Version 1.5.11 [April 24, 2012]
+Version 1.5.11 [April 26, 2012]
   Revised scripts/makefile.darwin: use system zlib; remove quotes around
     architecture list; add missing ppc architecture; add architecture options
     to shared library link; don't try to create a shared lib based on missing
@@ -34,6 +34,7 @@ Version 1.5.11 [April 24, 2012]
   Enable png_set_check_for_invalid_index() for both read and write.
   Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around
     declaration of png_handle_unknown().
+  Added -lssp_nonshared to scripts/makefile.freebsd
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 7f4695835..3ca199f45 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3854,7 +3854,7 @@ Version 1.5.10 [March 29, 2012]
   Revised png_set_text_2() to avoid potential memory corruption (fixes
     CVE-2011-3048).
 
-Version 1.5.11 [April 24, 2012]
+Version 1.5.11 [April 26, 2012]
   Revised scripts/makefile.darwin: use system zlib; remove quotes around
     architecture list; add missing ppc architecture; add architecture options
     to shared library link; don't try to create a shared lib based on missing
@@ -3862,6 +3862,7 @@ Version 1.5.11 [April 24, 2012]
   Enable png_set_check_for_invalid_index() for both read and write.
   Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around
     declaration of png_handle_unknown().
+  Added -lssp_nonshared to scripts/makefile.freebsd
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd
index 994608c99..612e0247d 100644
--- a/scripts/makefile.freebsd
+++ b/scripts/makefile.freebsd
@@ -25,7 +25,10 @@ MANDIR=		/man/man
 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   # for OSVERSION < 800000
+LDADD+=         -lm -lz -lssp_nonshared
+
 DPADD+=         ${LIBM} ${LIBZ}
 
 CFLAGS+= -I.