diff --git a/ChangeLog b/ChangeLog
index 13241f14..9c437872 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-08  Andrey Kiselev  <dron@remotesensing.org>
+
+	* tools/bmp2tiff.c: Added new utility to convert Windows BMP files
+	into TIFFs.
+
 2004-06-07  Andrey Kiselev  <dron@remotesensing.org>
 
 	* libtiff 3.7.0alpha released.
diff --git a/configure b/configure
index 9ff522ce..0052f3f2 100755
--- a/configure
+++ b/configure
@@ -20259,7 +20259,8 @@ esac
 
 
 
-for ac_header in fcntl.h limits.h malloc.h sys/time.h unistd.h winsock.h
+
+for ac_header in fcntl.h limits.h malloc.h sys/time.h unistd.h winsock.h getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/configure.ac b/configure.ac
index 78dadbbc..48285f00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,7 @@ case "$target_os" in
 esac
 
 dnl Checks for header files.
-AC_CHECK_HEADERS([fcntl.h limits.h malloc.h sys/time.h unistd.h winsock.h])
+AC_CHECK_HEADERS([fcntl.h limits.h malloc.h sys/time.h unistd.h winsock.h getopt.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
diff --git a/libtiff/config.h.in b/libtiff/config.h.in
index 07a47003..24757a6a 100644
--- a/libtiff/config.h.in
+++ b/libtiff/config.h.in
@@ -12,6 +12,9 @@
 /* Define to 1 if you have the `getopt' function. */
 #undef HAVE_GETOPT
 
+/* Define to 1 if you have the <getopt.h> header file. */
+#undef HAVE_GETOPT_H
+
 /* Define as 0 or 1 according to the floating point format suported by the
    machine */
 #undef HAVE_IEEEFP