diff --git a/ChangeLog b/ChangeLog
index 1a426a5c1..55d699b55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-24 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSBitmapImageRep+JPEG.m(-_JPEGRepresentationWithProperties:errorMessage:):
+	Correct JPEG export which was using size instead of pixelsWide and pixelsHigh.
+
 2017-03-20 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/GSXibKeyedUnarchiver.m:
diff --git a/Source/NSBitmapImageRep+JPEG.m b/Source/NSBitmapImageRep+JPEG.m
index b401e5e32..a51f1fa44 100644
--- a/Source/NSBitmapImageRep+JPEG.m
+++ b/Source/NSBitmapImageRep+JPEG.m
@@ -581,9 +581,9 @@ static void gs_jpeg_memory_dest_destroy (j_compress_ptr cinfo)
   colorSpace = [self colorSpaceName];
   imageSource = [self bitmapData];
   sPP = [self samplesPerPixel];
-  width = [self size].width;
-  height = [self size].height;
-  row_stride = width * sPP;
+  width = [self pixelsWide];
+  height = [self pixelsHigh];
+  row_stride = [self bytesPerRow];
 
   // set parameters
   cinfo.image_width  = width;