diff --git a/ChangeLog b/ChangeLog
index ab271e3d..c52a368d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-22  Joris Van Damme  <joris.at.lebbeke@skynet.be>
+
+	* tif_jpeg.c: Resolved buffer incrementation bug that lead to faulty images
+	at best, access violation at worst, when subsampled JPEG compressed imagery
+	is decoded without the JPEG_COLORMODE feature
+
 2007-10-11  Frank Warmerdam  <warmerdam@pobox.com>
 
 	* html/index.html: Update "people responsible" section.
diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c
index 3ba1b9e3..3f86da45 100644
--- a/libtiff/tif_jpeg.c
+++ b/libtiff/tif_jpeg.c
@@ -1,4 +1,4 @@
-/* $Id: tif_jpeg.c,v 1.73 2007-07-18 15:26:09 dron Exp $ */
+/* $Id: tif_jpeg.c,v 1.74 2007-10-22 18:39:54 joris Exp $ */
 
 /*
  * Copyright (c) 1994-1997 Sam Leffler
@@ -1334,10 +1334,8 @@ JPEGDecodeRaw(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s)
 
 			sp->scancount ++;
 			tif->tif_row += sp->v_sampling;
-			/* increment/decrement of buf and cc is still incorrect, but should not matter
-			 * TODO: resolve this */
-			buf += sp->bytesperline;
-			cc -= sp->bytesperline;
+			buf += clumps_per_line*samples_per_clump;
+			cc -= clumps_per_line*samples_per_clump;
 			nrows -= sp->v_sampling;
 		} while (nrows > 0);