diff --git a/ANNOUNCE b/ANNOUNCE
index c3e9e98a4..21d69b32a 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -65,7 +65,6 @@ Version 1.6.32beta08 [August 3, 2017]
     does not work (the eXIf chunk data can contain zeroes).
 
 Version 1.6.32beta09 [August 3, 2017]
-  Temporarily disable IDAT length-limiting.
   Require cmake-2.8.8 in CMakeLists.txt. Revised symlink creation,
     no longer using deprecated cmake LOCATION feature (Clifford Yapp).
 
diff --git a/CHANGES b/CHANGES
index 9df6bc457..eb77e5401 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5948,7 +5948,6 @@ Version 1.6.32beta08 [August 3, 2017]
     does not work (the eXIf chunk data can contain zeroes).
 
 Version 1.6.32beta09 [August 3, 2017]
-  Temporarily disable IDAT length-limiting.
   Require cmake-2.8.8 in CMakeLists.txt. Revised symlink creation,
     no longer using deprecated cmake LOCATION feature (Clifford Yapp).
   
diff --git a/pngpread.c b/pngpread.c
index e61202add..c7721461a 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -226,7 +226,6 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
 
    if (chunk_name == png_IDAT)
    {
-#if 0 /* some pngtests are failing */
       size_t row_factor =
          (png_ptr->width * png_ptr->channels * (png_ptr->bit_depth > 8? 2: 1)
           + 1 + (png_ptr->interlaced? 6: 0));
@@ -234,11 +233,8 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
          limit=PNG_UINT_31_MAX;
       else
          limit = png_ptr->height * row_factor;
-      limit += 6 + 5*limit/32566; /* zlib+deflate overhead */
+      limit += 6 + 5*(limit/32566+1); /* zlib+deflate overhead */
       limit=limit < PNG_UINT_31_MAX? limit : PNG_UINT_31_MAX;
-#else
-      limit=PNG_UINT_31_MAX;
-#endif
    }
    else
    {
@@ -253,7 +249,9 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
    }
    if (png_ptr->push_length > limit)
    {
-      png_debug2(1," png_ptr->push_length = %lu, limit = %lu",
+      printf(" png_ptr->push_length = %lu, limit = %lu\n",
+         (unsigned long)png_ptr->push_length,(unsigned long)limit);
+      png_debug2(0," png_ptr->push_length = %lu, limit = %lu",
          (unsigned long)png_ptr->push_length,(unsigned long)limit);
       png_chunk_error(png_ptr, "chunk data is too large");
    }
diff --git a/pngrutil.c b/pngrutil.c
index a57f13bba..2baa11512 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -196,7 +196,6 @@ png_read_chunk_header(png_structrp png_ptr)
    }
    else
    {
-#if 0 /* some pngtests are failing */
       size_t row_factor =
          (png_ptr->width * png_ptr->channels * (png_ptr->bit_depth > 8? 2: 1)
           + 1 + (png_ptr->interlaced? 6: 0));
@@ -204,17 +203,16 @@ png_read_chunk_header(png_structrp png_ptr)
          limit=PNG_UINT_31_MAX;
       else
          limit = png_ptr->height * row_factor;
-      limit += 6 + 5*limit/32566; /* zlib+deflate overhead */
+      limit += 6 + 5*(limit/32566+1); /* zlib+deflate overhead */
       limit=limit < PNG_UINT_31_MAX? limit : PNG_UINT_31_MAX;
-#else
-      limit=PNG_UINT_31_MAX;
-#endif
    }
 
    if (length > limit)
    {
-      png_debug2(1," png_ptr->push_length = %lu, limit = %lu",
-         (unsigned long)png_ptr->push_length,(unsigned long)limit);
+      printf(" length = %lu, limit = %lu\n",
+         (unsigned long)length,(unsigned long)limit);
+      png_debug2(0," length = %lu, limit = %lu",
+         (unsigned long)length,(unsigned long)limit);
       png_chunk_error(png_ptr, "chunk data is too large");
    }