diff --git a/ANNOUNCE b/ANNOUNCE
index 794d236b7..f6a16e734 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.6.0beta04 - December 24, 2011
+Libpng 1.6.0beta04 - December 26, 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.
@@ -77,7 +77,7 @@ Version 1.6.0beta03 [December 22, 2011]
     decreases in code size by 1733 bytes.  pngerror.o increases in size by
     about 465 bytes because of the new functionality.
 
-Version 1.6.0beta04 [December 24, 2011]
+Version 1.6.0beta04 [December 26, 2011]
   Regenerated configure scripts with automake-1.11.2
   Eliminated png_info_destroy(). It is now used only in png.c and only calls
     one other internal function and memset().
@@ -91,6 +91,8 @@ Version 1.6.0beta04 [December 24, 2011]
     single pointer.  This means adding C99 'restrict' to the pointer gives
     the compiler some opportunity to optimize the code.  This change allows
     that.
+  Moved AC_MSG_CHECKING([if libraries can be versioned]) later to the proper
+    location in configure.ac (Gilles Espinasse).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 2f9a54303..df97fed40 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3828,7 +3828,7 @@ Version 1.6.0beta03 [December 22, 2011]
     decreases in code size by 1733 bytes.  pngerror.o increases in size by
     about 465 bytes because of the new functionality.
 
-Version 1.6.0beta04 [December 24, 2011]
+Version 1.6.0beta04 [December 26, 2011]
   Regenerated configure scripts with automake-1.11.2
   Eliminated png_info_destroy(). It is now used only in png.c and only calls
     one other internal function and memset().
@@ -3842,6 +3842,8 @@ Version 1.6.0beta04 [December 24, 2011]
     single pointer.  This means adding C99 'restrict' to the pointer gives
     the compiler some opportunity to optimize the code.  This change allows
     that.
+  Moved AC_MSG_CHECKING([if libraries can be versioned]) later to the proper
+    location in configure.ac (Gilles Espinasse).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/configure.ac b/configure.ac
index 950a3b183..d10fc573e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,8 +97,6 @@ AC_CHECK_LIB(z, zlibVersion, ,
 AC_CHECK_LIB([m], [feenableexcept])
 AC_CHECK_FUNCS([feenableexcept])
 
-AC_MSG_CHECKING([if libraries can be versioned])
-
 AC_MSG_CHECKING([if using Solaris linker])
 SLD=`$LD --version 2>&1 | grep Solaris`
 if test "$SLD"; then
@@ -110,6 +108,7 @@ else
 fi
 AM_CONDITIONAL(HAVE_SOLARIS_LD, test "$have_solaris_ld" = "yes")
 
+AC_MSG_CHECKING([if libraries can be versioned])
 # Special case for PE/COFF platforms: ld reports
 # support for version-script, but doesn't actually
 # DO anything with it.