diff --git a/ChangeLog b/ChangeLog
index 83f77960c..e1d14d4f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-08  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSBitmapImageRep+JPEG.m: Handle patched jpeg library 
+	found on CYGWIN.
+
 2008-08-07 18:23-EDT Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Headers/AppKit/NSTokenFieldCell.h
diff --git a/Source/NSBitmapImageRep+JPEG.m b/Source/NSBitmapImageRep+JPEG.m
index 145354a40..b437a9dd6 100644
--- a/Source/NSBitmapImageRep+JPEG.m
+++ b/Source/NSBitmapImageRep+JPEG.m
@@ -50,6 +50,10 @@
 #endif
 #endif
 #include <jpeglib.h>
+#if defined(__CYGWIN__)
+/* Cygwin uses a patched jpeg */
+#define GSTEP_PROGRESSIVE_CODEC
+#endif
 
 #include <setjmp.h>
 
@@ -465,7 +469,11 @@ static void gs_jpeg_memory_dest_destroy (j_compress_ptr cinfo)
         }
     }
 
+#ifdef GSTEP_PROGRESSIVE_CODEC
+  isProgressive = (cinfo.process == JPROC_PROGRESSIVE);
+#else
   isProgressive = cinfo.progressive_mode;
+#endif
 
   /* done */
   jpeg_finish_decompress(&cinfo);
@@ -599,7 +607,12 @@ static void gs_jpeg_memory_dest_destroy (j_compress_ptr cinfo)
   progressiveNumber = [properties objectForKey: NSImageProgressive];
   if (progressiveNumber != nil)
     {
+#ifdef GSTEP_PROGRESSIVE_CODEC
+      if ([progressiveNumber boolValue])
+        cinfo.process = JPROC_PROGRESSIVE;
+#else
       cinfo.progressive_mode = [progressiveNumber boolValue];
+#endif
     }