diff --git a/ANNOUNCE b/ANNOUNCE
index 037d754299053957fb6d205f28350362e1bb01f8..c9cd11934a6d6ebd40f0a71bb79e425233dc7105 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -527,6 +527,7 @@ Version 1.6.0beta30 [October 24, 2012]
 
 Version 1.6.0beta31 [October 26, 2012]
   Undid the erroneous change to vstudio/pngvalid build in libpng-1.6.0beta30.
+  Made pngvalid so that it will build outside the libpng source tree.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index a7fad813a7025c9f6a471539ca4ab4dc0b13c1dd..0a25103d3453436323bbf7d91f6a8c2e4d2c9305 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4279,6 +4279,7 @@ Version 1.6.0beta30 [October 24, 2012]
 
 Version 1.6.0beta31 [October 26, 2012]
   Undid the erroneous change to vstudio/pngvalid build in libpng-1.6.0beta30.
+  Made pngvalid so that it will build outside the libpng source tree.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c
index c1f41bc52d25e3e0b83f34761111c3b9fac5a515..7d39161a839ca1fa97167a6557edab14e7483117 100644
--- a/contrib/libtests/pngvalid.c
+++ b/contrib/libtests/pngvalid.c
@@ -107,7 +107,11 @@ typedef png_byte *png_const_bytep;
 #endif
 
 /***************************** EXCEPTION HANDLING *****************************/
-#include "../visupng/cexcept.h"
+#ifdef PNG_FREESTANDING_TESTS
+#  include <cexcept.h>
+#else
+#  include "../visupng/cexcept.h"
+#endif
 
 #ifdef __cplusplus
 #  define this not_the_cpp_this