diff --git a/ChangeLog.txt b/ChangeLog.txt
index 68552bfd..83dda9ae 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -14,6 +14,10 @@ When using a 32-bit version of CMake on 64-bit Windows, it is impossible to
 access the c:\WINDOWS\system32 directory, which made it impossible for the
 TurboVNC build scripts to bundle the 64-bit TurboJPEG DLL.
 
+[3] Fixed a bug whereby attempting to encode a progressive JPEG with arithmetic
+entropy coding (jpegtran -progressive -arithmetic) would result in an error,
+"Requested feature was omitted at compile time".
+
 
 1.3.0
 =====
diff --git a/jcmaster.c b/jcmaster.c
index bee0cafc..accfc701 100644
--- a/jcmaster.c
+++ b/jcmaster.c
@@ -602,7 +602,7 @@ jinit_c_master_control (j_compress_ptr cinfo, boolean transcode_only)
     cinfo->num_scans = 1;
   }
 
-  if (cinfo->progressive_mode)	/*  TEMPORARY HACK ??? */
+  if (cinfo->progressive_mode && !cinfo->arith_code)	/*  TEMPORARY HACK ??? */
     cinfo->optimize_coding = TRUE; /* assume default tables no good for progressive mode */
 
   /* Initialize my private state */