diff --git a/ChangeLog b/ChangeLog
index 540feea9..362dfafc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-25  Karl Eichwalder  <ke@suse.de>
+
+	* Makefile.in (SUBDIRS): Add 'windows'.
+
 2000-12-05  Hrvoje Niksic  <hniksic@arsdigita.com>
 
 	* configure.in: Don't unconditionally define HAVE_SSL, even when
diff --git a/Makefile.in b/Makefile.in
index c20287c6..6b3b28e5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,7 +69,7 @@ prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \
 infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
 
 # subdirectories in the distribution
-SUBDIRS = src doc po util
+SUBDIRS = src doc po util windows
 
 # default target
 all: src/config.h Makefile $(SUBDIRS)
diff --git a/configure b/configure
index 24fd41ea..ff08c508 100755
--- a/configure
+++ b/configure
@@ -3638,6 +3638,7 @@ srcdir=$ac_given_srcdir # Advanced autoconf hackery
    echo "creating po/Makefile"
    sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
   
+test -d windows || mkdir windows
 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
 exit 0
 EOF
diff --git a/configure.in b/configure.in
index 2b76a49e..ef12b1ff 100644
--- a/configure.in
+++ b/configure.in
@@ -229,4 +229,5 @@ dnl Create output
 dnl
 AC_OUTPUT([Makefile src/Makefile doc/Makefile util/Makefile po/Makefile.in],
 [WGET_PROCESS_PO
+test -d windows || mkdir windows
 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h])