diff --git a/ANNOUNCE b/ANNOUNCE
index 7aaf171bc..d80b81075 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.7.0beta07 - April 8, 2013
+Libpng 1.7.0beta07 - April 13, 2013
 
 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.
@@ -236,11 +236,15 @@ Version 1.7.0beta06 [March 13, 2013]
     technically valid, although a reasonable treatment of division would
     show it to be incorrect.
 
-Version 1.7.0beta07 [April 8, 2013]
+Version 1.7.0beta07 [April 13, 2013]
   Updated documentation of 1.5.x to 1.6.x changes in iCCP chunk handling.
   Fixed incorrect warning of excess deflate data. End condition - the
     warning would be produced if the end of the deflate stream wasn't read
     in the last row.  The warning is harmless.
+  Corrected the test on user transform changes on read. It was in the
+    png_set of the transform function, but that doesn't matter unless the
+    transform function changes the rowbuf size, and that is only valid if
+    transform_info is called.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 6a68ac0ea..bf709b394 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4523,11 +4523,15 @@ Version 1.7.0beta06 [March 13, 2013]
     technically valid, although a reasonable treatment of division would
     show it to be incorrect.
 
-Version 1.7.0beta07 [April 8, 2013]
+Version 1.7.0beta07 [April 13, 2013]
   Updated documentation of 1.5.x to 1.6.x changes in iCCP chunk handling.
   Fixed incorrect warning of excess deflate data. End condition - the
     warning would be produced if the end of the deflate stream wasn't read
     in the last row.  The warning is harmless.
+  Corrected the test on user transform changes on read. It was in the
+    png_set of the transform function, but that doesn't matter unless the
+    transform function changes the rowbuf size, and that is only valid if
+    transform_info is called.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngrtran.c b/pngrtran.c
index 219cd6681..6d3fc6016 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1056,9 +1056,6 @@ png_set_read_user_transform_fn(png_structrp png_ptr, png_user_transform_ptr
 {
    png_debug(1, "in png_set_read_user_transform_fn");
 
-   if (!png_rtran_ok(png_ptr, 0))
-      return;
-
 #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
    png_ptr->transformations |= PNG_USER_TRANSFORM;
    png_ptr->read_user_transform_fn = read_user_transform_fn;
diff --git a/pngtrans.c b/pngtrans.c
index 089d87769..388ec5469 100644
--- a/pngtrans.c
+++ b/pngtrans.c
@@ -784,6 +784,15 @@ png_set_user_transform_info(png_structrp png_ptr, png_voidp
 
    if (png_ptr == NULL)
       return;
+
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
+   if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
+      (png_ptr->flags & PNG_FLAG_ROW_INIT) != 0)
+         png_app_error(png_ptr,
+            "info change after png_start_read_image or png_read_update_info");
+      return;
+#endif
+
    png_ptr->user_transform_ptr = user_transform_ptr;
    png_ptr->user_transform_depth = (png_byte)user_transform_depth;
    png_ptr->user_transform_channels = (png_byte)user_transform_channels;