diff --git a/pngpriv.h b/pngpriv.h
index 7fd8549f6130c3cf2596fff67f1b6799a1fb5309..7c2975006b2fdc9b71e0719080cd2870f21a729d 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -277,6 +277,7 @@ typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp;
 #define PNG_BACKGROUND_IS_GRAY     0x800
 #define PNG_HAVE_PNG_SIGNATURE    0x1000
 #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
+#define PNG_ZLIB_READY_FOR_ZTXT   0x4000 /* 1: ready for ZTXT; 0: for IDAT */
 
 /* Flags for the transformations the PNG library does on the image data */
 #define PNG_BGR                 0x0001
diff --git a/pngwutil.c b/pngwutil.c
index de99afc36d2d88bb5155797b23043932bf358ec4..01e4c162766697ceb64e709faaed97b95426e678 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -256,26 +256,33 @@ png_text_compress(png_structp png_ptr,
     * wouldn't cause a failure, just a slowdown due to swapping).
     */
 
-   /* Initialize the compressor.  To do: Why do we need this? */
-   ret = deflateInit2(&png_ptr->zstream, png_ptr->zlib_text_level,
-       png_ptr->zlib_text_method, png_ptr->zlib_text_window_bits,
-       png_ptr->zlib_text_mem_level, png_ptr->zlib_text_strategy);
-
-   if (ret != Z_OK)
-   {
-      if (ret == Z_VERSION_ERROR)
-         png_error(png_ptr,
-            "zlib failed to initialize compressor for text-- version error");
-
-      if (ret == Z_STREAM_ERROR)
-         png_error(png_ptr,
+   if (!(png_ptr->mode & PNG_ZLIB_READY_FOR_ZTXT))
+     {
+        /* Free memory from previously opened zstream */
+        deflateEnd(&png_ptr->zstream);
+
+        /* Initialize the compressor for zTXt compression. */
+        ret = deflateInit2(&png_ptr->zstream, png_ptr->zlib_text_level,
+            png_ptr->zlib_text_method, png_ptr->zlib_text_window_bits,
+            png_ptr->zlib_text_mem_level, png_ptr->zlib_text_strategy);
+
+        if (ret != Z_OK)
+        {
+           if (ret == Z_VERSION_ERROR)
+              png_error(png_ptr,
+              "zlib failed to initialize compressor for text-- version error");
+
+           if (ret == Z_STREAM_ERROR)
+              png_error(png_ptr,
              "zlib failed to initialize compressor for text-- stream error");
 
-      if (ret == Z_MEM_ERROR)
-         png_error(png_ptr,
+           if (ret == Z_MEM_ERROR)
+              png_error(png_ptr,
              "zlib failed to initialize compressor for text-- mem error");
 
-      png_error(png_ptr, "zlib failed to initialize compressor for text");
+           png_error(png_ptr, "zlib failed to initialize compressor for text");
+      }
+      png_ptr->mode |= PNG_ZLIB_READY_FOR_ZTXT;
    }
 
    /* Set up the compression buffers */
@@ -685,7 +692,7 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
        png_ptr->zlib_method, png_ptr->zlib_window_bits,
        png_ptr->zlib_mem_level, png_ptr->zlib_strategy);
 
-   png_ptr->mode = PNG_HAVE_IHDR;
+   png_ptr->mode = PNG_HAVE_IHDR; /* not READY_FOR_ZTXT */
 }
 
 /* Write the palette.  We are careful not to trust png_color to be in the
@@ -778,28 +785,32 @@ png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
       int ret;
       unsigned int z_cmf;  /* zlib compression method and flags */
 
-      /* Free memory from previously opened zstream */
-      deflateEnd(&png_ptr->zstream);
+      if (png_ptr->mode & PNG_ZLIB_READY_FOR_ZTXT)
+      {
+         /* Free memory from previously opened zstream */
+         deflateEnd(&png_ptr->zstream);
 
-      ret = deflateInit2(&png_ptr->zstream, png_ptr->zlib_level,
-          png_ptr->zlib_method, png_ptr->zlib_window_bits,
-          png_ptr->zlib_mem_level, png_ptr->zlib_strategy);
+         ret = deflateInit2(&png_ptr->zstream, png_ptr->zlib_level,
+             png_ptr->zlib_method, png_ptr->zlib_window_bits,
+             png_ptr->zlib_mem_level, png_ptr->zlib_strategy);
 
-      if (ret != Z_OK)
-      {
-         if (ret == Z_VERSION_ERROR)
-            png_error(png_ptr,
-               "zlib failed to initialize compressor -- version error");
+         if (ret != Z_OK)
+         {
+            if (ret == Z_VERSION_ERROR)
+               png_error(png_ptr,
+                  "zlib failed to initialize compressor -- version error");
 
-         if (ret == Z_STREAM_ERROR)
-            png_error(png_ptr,
-                "zlib failed to initialize compressor -- stream error");
+            if (ret == Z_STREAM_ERROR)
+               png_error(png_ptr,
+                   "zlib failed to initialize compressor -- stream error");
 
-         if (ret == Z_MEM_ERROR)
-            png_error(png_ptr,
-                "zlib failed to initialize compressor -- mem error");
+            if (ret == Z_MEM_ERROR)
+               png_error(png_ptr,
+                   "zlib failed to initialize compressor -- mem error");
 
-         png_error(png_ptr, "zlib failed to initialize compressor");
+            png_error(png_ptr, "zlib failed to initialize compressor");
+         }
+         png_ptr->mode &= ~PNG_ZLIB_READY_FOR_ZTXT; /* Ready for IDAT */
       }
 
       png_ptr->zstream.next_out = png_ptr->zbuf;