diff --git a/ANNOUNCE b/ANNOUNCE
index f20edb4de..08b9d83b5 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,33 +1,32 @@
 
-Libpng 1.4.7rc01 - April 9, 2011
+Libpng 1.4.7 - April 10, 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.
+This is a public release of libpng, intended for use in production codes.
 
 Files available for download:
 
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   1.4.7rc01.tar.xz (LZMA-compressed, recommended)
-   1.4.7rc01.tar.gz
-   1.4.7rc01.tar.bz2
+   libpng-1.4.7.tar.xz (LZMA-compressed, recommended)
+   libpng-1.4.7.tar.gz
+   libpng-1.4.7.tar.bz2
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp147r01.7z (LZMA-compressed, recommended)
-   lp147r01.zip
+   lpng147.7z (LZMA-compressed, recommended)
+   lpng147.zip
 
 Other information:
 
-   1.4.7rc01-README.txt
-   1.4.7rc01-LICENSE.txt
+   libpng-1.4.7-README.txt
+   libpng-1.4.7-LICENSE.txt
 
 Changes since the last public release (1.4.6):
 
-version 1.4.7rc01 [April 9, 2011]
   Relocated misplaced new declarations in pngwutil.c.
+  Disabled PNG_PEDANTIC_WARNINGS for all MSC versions as in libpng-1.4.5.
 
 Send comments/corrections/commendations to glennrp at users.sourceforge.net
 or to png-mng-implement at lists.sf.net (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 80561376f..6574a0bea 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2791,6 +2791,10 @@ version 1.4.6 [April 8, 2011]
 version 1.4.7rc01 [April 9, 2011]
   Relocated misplaced new declarations in pngwutil.c.
 
+version 1.4.7 [April 10, 2011]
+  Disabled PNG_PEDANTIC_WARNINGS for all MSC versions as in libpng-1.4.5.
+
+
 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 e061e237b..397b75fa2 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.4.7rc01 - April 9, 2011
+ * libpng version 1.4.7 - April 10, 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,37 +1413,6 @@ 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