diff --git a/ANNOUNCE b/ANNOUNCE
index bf003b5be..814a8d01e 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.5.2beta01 - February 5, 2011
+Libpng 1.5.2beta01 - February 6, 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.
@@ -26,11 +26,10 @@ Other information:
 
 Changes since the last public release (1.5.1):
 
-Version 1.5.2beta01 [February 5, 2011]
+Version 1.5.2beta01 [February 6, 2011]
   More -Wshadow fixes for older gcc compilers.  Older gcc versions apparently
     check formal parameters names in function declarations (as well as
     definitions) to see if they match a name in the global namespace.
-  Add __clang__ special case in pngconf.h
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 8acf4d79c..1edd94a32 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3242,11 +3242,10 @@ Version 1.5.1rc02 [January 31, 2011]
 Version 1.5.1 [February 3, 2011]
   No changes.
 
-Version 1.5.2beta01 [February 5, 2011]
+Version 1.5.2beta01 [February 6, 2011]
   More -Wshadow fixes for older gcc compilers.  Older gcc versions apparently
     check formal parameters names in function declarations (as well as
     definitions) to see if they match a name in the global namespace.
-  Add __clang__ special case in pngconf.h
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngconf.h b/pngconf.h
index c812952dc..3119beaa6 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -287,10 +287,10 @@
  * PNG_EXPORT function for every compiler.
  */
 #ifndef PNG_FUNCTION
-#  if defined(__GNUC__) && !defined(__clang__)
+#  if defined(__GNUC__)
 #     define PNG_FUNCTION(type, name, args, attributes)\
          attributes type name args
-#  else /* !GNUC || clang */
+#  else /* !GNUC */
 #     ifdef _MSC_VER
 #        define PNG_FUNCTION(type, name, args, attributes)\
          attributes type name args
@@ -347,7 +347,7 @@
    * functions in png.h will generate compiler warnings.  Added at libpng
    * version 1.2.41.
    */
-#  if defined(__GNUC__) && !defined(__clang__)
+#  if defined(__GNUC__)
 #    ifndef PNG_USE_RESULT
 #      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
 #    endif