diff --git a/ChangeLog b/ChangeLog
index cb005996d7..36e613fe52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec  7 14:27:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
+
+	* configure.in: Extra checks for uname and some header files
+	  (for MinGW Windows port).
+
 Fri Dec  7 14:27:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
 
 	* bootstrap, Makefile.am, gnulib/*: Import more gnulib
diff --git a/configure.in b/configure.in
index 811e1d6d45..123cde98ed 100644
--- a/configure.in
+++ b/configure.in
@@ -60,10 +60,10 @@ AM_PROG_CC_C_O
 LIBVIRT_COMPILE_WARNINGS(maximum)
 
 dnl Availability of various common functions (non-fatal if missing).
-AC_CHECK_FUNCS([regexec cfmakeraw])
+AC_CHECK_FUNCS([cfmakeraw regexec uname])
 
 dnl Availability of various common headers (non-fatal if missing).
-AC_CHECK_HEADERS([paths.h sys/syslimits.h])
+AC_CHECK_HEADERS([pwd.h paths.h sys/syslimits.h sys/utsname.h sys/wait.h winsock2.h])
 
 dnl Need -lrpc? (Cygwin needs this)
 AC_SEARCH_LIBS(xdrmem_create,rpc)
@@ -677,7 +677,7 @@ cp COPYING.LIB COPYING
 AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \
           docs/examples/Makefile docs/devhelp/Makefile \
 	  docs/examples/python/Makefile \
-	  gnulib/lib/Makefile gnulib/tests/Makefile \
+	  gnulib/lib/Makefile \
           libvirt.pc libvirt.spec \
           po/Makefile.in scripts/Makefile \
 	  include/libvirt/Makefile include/libvirt/libvirt.h \