diff --git a/ANNOUNCE b/ANNOUNCE
index 1f07ecb22..dabc7b050 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.4.6beta06 - March 19, 2011
+Libpng 1.4.6beta07 - March 19, 2011
 
 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.
@@ -9,20 +9,20 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   1.4.6beta06.tar.xz (LZMA-compressed, recommended)
-   1.4.6beta06.tar.gz
-   1.4.6beta06.tar.bz2
+   1.4.6beta07.tar.xz (LZMA-compressed, recommended)
+   1.4.6beta07.tar.gz
+   1.4.6beta07.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp146b06.7z (LZMA-compressed, recommended)
-   lp146b06.zip
+   lp146b07.7z (LZMA-compressed, recommended)
+   lp146b07.zip
 
 Other information:
 
-   1.4.6beta06-README.txt
-   1.4.6beta06-LICENSE.txt
+   1.4.6beta07-README.txt
+   1.4.6beta07-LICENSE.txt
 
 Changes since the last public release (1.4.5):
 
@@ -53,6 +53,10 @@ version 1.4.6beta06 [March 19, 2011]
   Updated contrib/pngsuite/README to add the word "modify".
   Added the private PNG_UNUSED() macro definition in pngconf.h.
 
+version 1.4.6beta07 [March 19, 2011]
+  ifdef out mask arrays in pngread.c when interlacing is not supported.
+  Added attribute definition (warnings) for MSC_VER >= 1300 in pngconf.h
+
 Send comments/corrections/commendations to glennrp at users.sourceforge.net
 or to png-mng-implement at lists.sf.net (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement).
diff --git a/CHANGES b/CHANGES
index 3fbbc6e02..6517c3135 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2765,6 +2765,10 @@ version 1.4.6beta06 [March 19, 2011]
   Updated contrib/pngsuite/README to add the word "modify".
   Added the private PNG_UNUSED() macro definition in pngconf.h.
 
+version 1.4.6beta07 [March 19, 2011]
+  ifdef out mask arrays in pngread.c when interlacing is not supported.
+  Added attribute definition (warnings) for MSC_VER >= 1300 in pngconf.h
+
 Send comments/corrections/commendations to glennrp at users.sourceforge.net
 or to png-mng-implement at lists.sf.net (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement).
diff --git a/pngconf.h b/pngconf.h
index a1b831a9e..04ed2a084 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.4.6beta06 - March 19, 2011
+ * libpng version 1.4.6beta07 - March 19, 2011
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1413,6 +1413,37 @@ typedef char            FAR * FAR * FAR * png_charppp;
 #      endif
 #    endif /* PNG_PRIVATE */
 #  endif /* __GNUC__ */
+
+#  if defined(_MSC_VER)  && (_MSC_VER >= 1300)
+#    ifndef PNG_USE_RESULT
+#      define PNG_USE_RESULT /* not supported */
+#    endif
+#    ifndef PNG_NORETURN
+#      define PNG_NORETURN   __declspec(noreturn)
+#    endif
+#    ifndef PNG_PTR_NORETURN
+#      define PNG_PTR_NORETURN /* not supported */
+#    endif
+#    ifndef PNG_ALLOCATED
+#      define PNG_ALLOCATED __declspec(restrict)
+#    endif
+
+    /* This specifically protects structure members that should only be
+     * accessed from within the library, therefore should be empty during
+     * a library build.
+     */
+#    ifndef PNGLIB_BUILD
+#      ifndef PNG_DEPRECATED
+#        define PNG_DEPRECATED __declspec(deprecated)
+#      endif
+#      ifndef PNG_DEPSTRUCT
+#        define PNG_DEPSTRUCT  __declspec(deprecated)
+#      endif
+#      ifndef PNG_PRIVATE
+#        define PNG_PRIVATE __declspec(deprecated)
+#      endif
+#    endif /* PNGLIB_BUILD */
+#  endif /* _MSC_VER */
 #endif /* PNG_PEDANTIC_WARNINGS */
 
 #ifndef PNG_DEPRECATED