diff --git a/ChangeLog b/ChangeLog
index 41a3c8b83..87b012ecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-29 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSBitmapImageRep.m: Set the TIFF subfield type to 0
+	instead of 255.
+
 2016-10-24 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSBitmapImageRep+JPEG.m: Try to handle images with alpha
@@ -24,7 +29,6 @@
 	* Source/NSLayoutManager.m: Use the pre-computed advancement
 	instead of calculating it every time.
 
->>>>>>> .r40169
 2016-10-22 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/GSLayoutManager.m: Don't try to get the advancement for
diff --git a/Source/NSBitmapImageRep.m b/Source/NSBitmapImageRep.m
index 639c1e4eb..773a78122 100644
--- a/Source/NSBitmapImageRep.m
+++ b/Source/NSBitmapImageRep.m
@@ -2009,7 +2009,7 @@ _set_bit_value(unsigned char *base, long msb_off, int bit_width,
 {
   info->numImages = 1;
   info->imageNumber = 0;
-  info->subfileType = 255;
+  info->subfileType = 0;
   info->width = _pixelsWide;
   info->height = _pixelsHigh;
   info->bitsPerSample = _bitsPerSample;