diff --git a/ChangeLog.txt b/ChangeLog.txt
index 6d6bdb5f9..6665aaa55 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -20,9 +20,10 @@ libjpeg-turbo with older versions of MinGW64, you will now have to add
 build to fail when using the Visual Studio IDE.
 
 [5] Fixed a bug in jpeg_read_coefficients() whereby it would not initialize
-cinfo->image_width and cinfo->image_height if libjpeg v8 emulation was enabled.
-This specifically caused the jpegoptim program to fail if it was linked against
-a version of libjpeg-turbo that was built with libjpeg v8 emulation.
+cinfo->image_width and cinfo->image_height if libjpeg v7 or v8 emulation was
+enabled.  This specifically caused the jpegoptim program to fail if it was
+linked against a version of libjpeg-turbo that was built with libjpeg v7 or v8
+emulation.
 
 
 1.1.0
diff --git a/jcmaster.c b/jcmaster.c
index 74df5556c..3ca346ca8 100644
--- a/jcmaster.c
+++ b/jcmaster.c
@@ -75,7 +75,9 @@ initial_setup (j_compress_ptr cinfo, boolean transcode_only)
   JDIMENSION jd_samplesperrow;
 
 #if JPEG_LIB_VERSION >= 70
+#if JPEG_LIB_VERSION >= 80
   if (!transcode_only)
+#endif
     jpeg_calc_jpeg_dimensions(cinfo);
 #endif