diff --git a/ANNOUNCE b/ANNOUNCE
index 4fee22d35..d6a1d23e3 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.5.0beta21 - April 25, 2010
+Libpng 1.5.0beta21 - April 27, 2010
 
 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.
@@ -189,10 +189,12 @@ version 1.5.0beta19 [April 24, 2010]
 version 1.5.0beta20 [April 24, 2010]
   Relaxed more overly-restrictive permissions of some files.
 
-version 1.5.0beta21 [April 25, 2010]
+version 1.5.0beta21 [April 27, 2010]
   Removed some unwanted binary bytes and changed CRLF to NEWLINE in the new
     vstudio project files, and some trivial editing of some files in the
     scripts directory.
+  Set PNG_NO_READ_BGR, PNG_NO_IO_STATE, and PNG_NO_TIME_RFC1123 in
+    contrib/pngminim/decoder/pngusr.h to make a smaller decoder application.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 3c9dc0ae7..0de39744f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2671,10 +2671,12 @@ version 1.5.0beta19 [April 24, 2010]
 version 1.5.0beta20 [April 24, 2010]
   Relaxed more overly-restrictive permissions of some files.
 
-version 1.5.0beta21 [April 25, 2010]
+version 1.5.0beta21 [April 27, 2010]
   Removed some unwanted binary bytes and changed CRLF to NEWLINE in the new
     vstudio project files, and some trivial editing of some files in the
     scripts directory.
+  Set PNG_NO_READ_BGR, PNG_NO_IO_STATE, and PNG_NO_TIME_RFC1123 in
+    contrib/pngminim/decoder/pngusr.h to make a smaller decoder application.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/contrib/pngminim/decoder/pngusr.h b/contrib/pngminim/decoder/pngusr.h
index 093b20cf7..397eb1164 100644
--- a/contrib/pngminim/decoder/pngusr.h
+++ b/contrib/pngminim/decoder/pngusr.h
@@ -23,6 +23,7 @@
 #define PNG_NO_ERROR_TEXT
 #define PNG_NO_READ_INT_FUNCTIONS
 
+#define PNG_NO_READ_BGR
 #define PNG_NO_READ_GAMMA
 #define PNG_NO_READ_BACKGROUND
 #define PNG_NO_READ_QUANTIZE
@@ -59,6 +60,7 @@
 #define PNG_NO_WRITE_SUPPORTED
 
 #define PNG_NO_INFO_IMAGE
+#define PNG_NO_IO_STATE
 #define PNG_NO_USER_MEM
 #define PNG_NO_FIXED_POINT_SUPPORTED
 #define PNG_NO_MNG_FEATURES
@@ -71,6 +73,7 @@
 #define PNG_NO_PROGRESSIVE_READ
 #define PNG_NO_USER_LIMITS
 #define PNG_NO_SET_USER_LIMITS
-#define PNG_NO_CONVERT_TIME_RFC1123
+#define PNG_NO_TIME_RFC1123
 
 #endif /* MINRDPNGCONF_H */
+
diff --git a/contrib/pngminim/encoder/pngusr.h b/contrib/pngminim/encoder/pngusr.h
index 293d15ffa..c99e05a52 100644
--- a/contrib/pngminim/encoder/pngusr.h
+++ b/contrib/pngminim/encoder/pngusr.h
@@ -21,6 +21,7 @@
 #define PNG_NO_ERROR_TEXT
 
 #define PNG_NO_WRITE_BACKGROUND
+#define PNG_NO_WRITE_BGR
 #define PNG_NO_WRITE_GAMMA
 #define PNG_NO_WRITE_QUANTIZE
 #define PNG_NO_WRITE_INVERT
@@ -57,6 +58,7 @@
 #define PNG_NO_WRITE_FLUSH
 
 #define PNG_NO_INFO_IMAGE
+#define PNG_NO_IO_STATE
 #define PNG_NO_USER_MEM
 #define PNG_NO_FIXED_POINT_SUPPORTED
 #define PNG_NO_MNG_FEATURES
@@ -68,6 +70,6 @@
 #define PNG_NO_EASY_ACCESS
 #define PNG_NO_USER_LIMITS
 #define PNG_NO_SET_USER_LIMITS
-#define PNG_NO_CONVERT_TIME_RFC1123
+#define PNG_NO_TIME_RFC1123
 
 #endif /* MINWRPNGCONF_H */
diff --git a/contrib/pngminim/preader/pngusr.h b/contrib/pngminim/preader/pngusr.h
index dea8c534a..c36abb638 100644
--- a/contrib/pngminim/preader/pngusr.h
+++ b/contrib/pngminim/preader/pngusr.h
@@ -19,6 +19,7 @@
 #define PNG_NO_ERROR_TEXT
 #define PNG_NO_READ_INT_FUNCTIONS
 
+#define PNG_NO_READ_BGR
 #define PNG_NO_READ_QUANTIZE
 #define PNG_NO_READ_INVERT
 #define PNG_NO_READ_SHIFT
@@ -50,6 +51,7 @@
 #define PNG_NO_WRITE_SUPPORTED
 
 #define PNG_NO_INFO_IMAGE
+#define PNG_NO_IO_STATE
 #define PNG_NO_USER_MEM
 #define PNG_NO_FIXED_POINT_SUPPORTED
 #define PNG_NO_MNG_FEATURES
@@ -61,6 +63,6 @@
 #define PNG_NO_EASY_ACCESS
 #define PNG_NO_USER_LIMITS
 #define PNG_NO_SET_USER_LIMITS
-#define PNG_NO_CONVERT_TIME_RFC1123
+#define PNG_NO_TIME_RFC1123
 
 #endif /* MINPRDPNGCONF_H */