diff --git a/ChangeLog b/ChangeLog
index 1d768d8a..56442ca2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-13  Ian Abbott  <abbotti@mev.co.uk>
+
+	* configure.bat: Removed (renamed to configure.bat.ini).
+	* configure.bat.in: New (renamed from configure.bat).
+	* Makefile.in: Add rule to copy configure.bat.in to configure.bat,
+	converting line endings to MS-DOS format in the process.
+
 2002-01-15  Hrvoje Niksic  <hniksic@arsdigita.com>
 
 	* MACHINES: OS X entry by Jonathan Davis.
diff --git a/Makefile.in b/Makefile.in
index 3756681a..6ebdd35f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,7 +75,7 @@ infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
 SUBDIRS = src doc po util windows
 
 # default target
-all: libtool src/config.h Makefile $(SUBDIRS)
+all: libtool src/config.h Makefile configure.bat $(SUBDIRS)
 
 check: all
 
@@ -102,6 +102,10 @@ install.mo:
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
 
+# Create configure.bat from configure.bat.in by DOS-ifying the lines.
+configure.bat: configure.bat.in
+	awk '{ print $$0 ($$0 ~ /\r$$/ ? "" : "\r") }' $@.in > $@
+
 # create tag files for Emacs
 TAGS:
 	cd src && $(MAKE) $@
diff --git a/configure.bat b/configure.bat.in
similarity index 100%
rename from configure.bat
rename to configure.bat.in