diff --git a/ChangeLog b/ChangeLog
index eda638ca..375e8797 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-11-04  Andrey Kiselev  <dron@remotesensing.org>
+
+	* libtiff/tif_dirinfo.c: Change definition for TIFFTAG_EXTRASAMPLES
+	field. The caller should supply a count when setting this field. As
+	per bug
+
+	 http://bugzilla.remotesensing.org/show_bug.cgi?id=648
+	
+	* libtiff/{tif_jpeg.c, tif_ojpeg.c}: TIFFTAG_JPEGTABLES should have
+	uint32 count. Use this type everywhere.
+
 2004-11-03  Frank Warmerdam  <warmerdam@pobox.com>
 
 	* libtiff/tif_next.c: avoid use of u_long and u_char types.  Bug 653.