diff --git a/configure b/configure
index 07a401ff7..067b27861 100755
--- a/configure
+++ b/configure
@@ -24653,6 +24653,9 @@ fi
 
 if test x_$enable_static_exe = x_yes; then
 	staticexe="-static"
+	if test "$on_mingw" = yes; then
+		staticexe="-all-static"
+	fi
 fi
 
 # set lock checking if requested
diff --git a/doc/Changelog b/doc/Changelog
index a9b522918..3f8405a8b 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+6 April 2009: Wouter
+	- windows compile fix.
+
 3 April 2009: Wouter
 	- Fixed a bug that caused messages to be stored in the cache too 
 	  long.  Hard to trigger, but NXDOMAINs for nameservers or CNAME