diff --git a/ChangeLog b/ChangeLog
index 8cff7a6f..9e81e9ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-2004-09-24  Andrey Kiselev  <dron@remotesensing.org>
+2004-09-25  Andrey Kiselev  <dron@remotesensing.org>
+
+	* tools/tiff2bw.c: Write ImageWidth/Height tags to output file, as
+	noted by Gennady Khokhorin.
 
 	* libtiff/tif_dirread.c: Always check the return values, returned
 	by the _TIFFmalloc() (Dmitry V. Levin).
diff --git a/libtiff/Makefile.am b/libtiff/Makefile.am
index f1b7a4b2..59733fed 100644
--- a/libtiff/Makefile.am
+++ b/libtiff/Makefile.am
@@ -29,7 +29,8 @@ LIBPORT = -L$(top_builddir)/port -lport
 # shared with other makefiles
 include files.lst
 
-EXTRA_DIST = Makefile.vc tif_config.h.vc tiffconf.h.vc files.lst $(EXTRA_SRCS)
+EXTRA_DIST = Makefile.vc tif_config.h.vc tiffconf.h.vc files.lst libtiff.def \
+	     $(EXTRA_SRCS)
 
 libtiffincludedir = $(includedir)
 libtiffinclude_HEADERS = $(HDRS)
diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in
index dd7fc3ca..a3a05975 100644
--- a/libtiff/Makefile.in
+++ b/libtiff/Makefile.in
@@ -314,7 +314,9 @@ EXTRA_SRCS = \
 
 # Read list of source files and headers from the external file,
 # shared with other makefiles
-EXTRA_DIST = Makefile.vc tif_config.h.vc tiffconf.h.vc files.lst $(EXTRA_SRCS)
+EXTRA_DIST = Makefile.vc tif_config.h.vc tiffconf.h.vc files.lst libtiff.def \
+	     $(EXTRA_SRCS)
+
 libtiffincludedir = $(includedir)
 libtiffinclude_HEADERS = $(HDRS)
 noinst_HEADERS = $(EXTRA_HDRS)
@@ -340,9 +342,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/fi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libtiff/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libtiff/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  libtiff/Makefile
+	  $(AUTOMAKE) --gnu  libtiff/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \