diff --git a/ChangeLog b/ChangeLog
index 54d8d678..e41a3af7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-01-23  Ben Elliston  <bje@cygnus.com>
+
+	* autoheader.sh: Force $tmpout to close to avoid Windows file
+	sharing conflicts. From Mark Elbrecht <snowball3@usa.net>.
+
 1999-01-21  Ben Elliston  <bje@cygnus.com>
 
 	* autoconf.texi (Introduction): Update bug reporting address.
diff --git a/autoheader.in b/autoheader.in
index ef4233a3..20eabaed 100644
--- a/autoheader.in
+++ b/autoheader.in
@@ -276,6 +276,8 @@ if test -n "$syms"; then
 fi
 
 if test $# -eq 0; then
+  # Force $tmpout to close to avoid Windows file sharing conflicts.
+  exec 1>&2
   if test $status -eq 0; then
     if test -f ${config_h_in} && cmp -s $tmpout ${config_h_in}; then
       rm -f $tmpout # File didn't change, so don't update its mod time.
diff --git a/autoheader.sh b/autoheader.sh
index ef4233a3..20eabaed 100644
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -276,6 +276,8 @@ if test -n "$syms"; then
 fi
 
 if test $# -eq 0; then
+  # Force $tmpout to close to avoid Windows file sharing conflicts.
+  exec 1>&2
   if test $status -eq 0; then
     if test -f ${config_h_in} && cmp -s $tmpout ${config_h_in}; then
       rm -f $tmpout # File didn't change, so don't update its mod time.
diff --git a/bin/autoheader.in b/bin/autoheader.in
index ef4233a3..20eabaed 100644
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -276,6 +276,8 @@ if test -n "$syms"; then
 fi
 
 if test $# -eq 0; then
+  # Force $tmpout to close to avoid Windows file sharing conflicts.
+  exec 1>&2
   if test $status -eq 0; then
     if test -f ${config_h_in} && cmp -s $tmpout ${config_h_in}; then
       rm -f $tmpout # File didn't change, so don't update its mod time.