diff --git a/ChangeLog b/ChangeLog
index a94dcc22d..36c2ba911 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
-Thu Aug 30 18:23:08 2001  Nicola Pero  <nicola@brainstorm.co.uk>
+2001-08-30  Adam Fedor  <fedor@gnu.org>
 
-	* Source/NSBitmapImageRep.m ([+canInitWithData:]): Do not call
-	NSTiffClose if the image is NULL (Suggested by Ludovic Marcotte
-	<ludovic@Sophos.ca>).
+	* Source/NSImage.m (-initWithCoder:): Fix encode typo.
+	* Source/tiff.m (NSTiffWrite): Don't set JPEG quality if not
+	doing JPEG compression
 
 Thu Aug 30 10:30:22 2001  Nicola Pero  <nicola@brainstorm.co.uk>
 
diff --git a/Source/NSImage.m b/Source/NSImage.m
index 64f389fa6..d3d361289 100644
--- a/Source/NSImage.m
+++ b/Source/NSImage.m
@@ -1031,23 +1031,23 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep)
 
       [coder decodeValueOfObjCType: @encode(NSSize) at: &_size];
       [coder decodeValueOfObjCType: @encode(id) at: &_color];
-      [coder encodeValueOfObjCType: @encode(BOOL) at: &flag];
+      [coder decodeValueOfObjCType: @encode(BOOL) at: &flag];
       _flags.scalable = flag;
-      [coder encodeValueOfObjCType: @encode(BOOL) at: &flag];
+      [coder decodeValueOfObjCType: @encode(BOOL) at: &flag];
       _flags.dataRetained = flag;
-      [coder encodeValueOfObjCType: @encode(BOOL) at: &flag];
+      [coder decodeValueOfObjCType: @encode(BOOL) at: &flag];
       _flags.flipDraw = flag;
-      [coder encodeValueOfObjCType: @encode(BOOL) at: &flag];
+      [coder decodeValueOfObjCType: @encode(BOOL) at: &flag];
       _flags.sizeWasExplicitlySet = flag;
-      [coder encodeValueOfObjCType: @encode(BOOL) at: &flag];
+      [coder decodeValueOfObjCType: @encode(BOOL) at: &flag];
       _flags.useEPSOnResolutionMismatch = flag;
-      [coder encodeValueOfObjCType: @encode(BOOL) at: &flag];
+      [coder decodeValueOfObjCType: @encode(BOOL) at: &flag];
       _flags.colorMatchPreferred = flag;
-      [coder encodeValueOfObjCType: @encode(BOOL) at: &flag];
+      [coder decodeValueOfObjCType: @encode(BOOL) at: &flag];
       _flags.multipleResolutionMatching = flag;
-      [coder encodeValueOfObjCType: @encode(BOOL) at: &flag];
+      [coder decodeValueOfObjCType: @encode(BOOL) at: &flag];
       _flags.cacheSeparately = flag;
-      [coder encodeValueOfObjCType: @encode(BOOL) at: &flag];
+      [coder decodeValueOfObjCType: @encode(BOOL) at: &flag];
       _flags.unboundedCacheDepth = flag;
 
       /*
diff --git a/Source/tiff.m b/Source/tiff.m
index 0d7743de9..2b41bf1ff 100644
--- a/Source/tiff.m
+++ b/Source/tiff.m
@@ -451,7 +451,8 @@ NSTiffWrite(TIFF* image, NSTiffInfo* info, char* data)
   TIFFSetField(image, TIFFTAG_IMAGEWIDTH, info->width);
   TIFFSetField(image, TIFFTAG_IMAGELENGTH, info->height);
   TIFFSetField(image, TIFFTAG_COMPRESSION, info->compression);
-  TIFFSetField(image, TIFFTAG_JPEGQUALITY, info->quality);
+  if (info->compression = COMPRESSION_JPEG)
+    TIFFSetField(image, TIFFTAG_JPEGQUALITY, info->quality);
   TIFFSetField(image, TIFFTAG_SUBFILETYPE, info->subfileType);
   TIFFSetField(image, TIFFTAG_BITSPERSAMPLE, info->bitsPerSample);
   TIFFSetField(image, TIFFTAG_SAMPLESPERPIXEL, info->samplesPerPixel);