diff --git a/ChangeLog b/ChangeLog
index 6a19c30e..fc64e843 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-08  Frank Warmerdam  <warmerdam@pobox.com>
+
+	* libtiff/tif_dirinfo.c: Fix bug with tif_foundfield and reallocation
+	of tif_fieldinfo.  
+
+	http://bugzilla.remotesensing.org/show_bug.cgi?id=630
+
 2004-10-04  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
 	* contrib/iptcutil/README: Added the missing README which goes
diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c
index a539c1a2..a27378ee 100644
--- a/libtiff/tif_dirinfo.c
+++ b/libtiff/tif_dirinfo.c
@@ -1,4 +1,4 @@
-/* $Id: tif_dirinfo.c,v 1.32 2004-10-02 13:29:41 dron Exp $ */
+/* $Id: tif_dirinfo.c,v 1.33 2004-10-08 14:06:16 fwarmerdam Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -304,6 +304,8 @@ _TIFFMergeFieldInfo(TIFF* tif, const TIFFFieldInfo info[], int n)
 	TIFFFieldInfo** tp;
 	int i;
 
+        tif->tif_foundfield = NULL;
+
 	if (tif->tif_nfields > 0) {
 		tif->tif_fieldinfo = (TIFFFieldInfo**)
 		    _TIFFrealloc(tif->tif_fieldinfo,