diff --git a/autobuild.sh b/autobuild.sh
index f682b51ee4..4d9f616d71 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -85,8 +85,7 @@ if test -x /usr/bin/i686-w64-mingw32-gcc ; then
     --host=i686-w64-mingw32 \
     --prefix="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw" \
     --enable-expensive-tests \
-    --enable-werror \
-    --without-libvirtd
+    --enable-werror
 
   make
   make install
@@ -105,8 +104,7 @@ if test -x /usr/bin/x86_64-w64-mingw32-gcc ; then
     --host=x86_64-w64-mingw32 \
     --prefix="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw" \
     --enable-expensive-tests \
-    --enable-werror \
-    --without-libvirtd
+    --enable-werror
 
   make
   make install
diff --git a/configure.ac b/configure.ac
index ea85851eb0..3371b46cb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,7 @@ case $host in
   *-*-linux*) with_linux=yes ;;
   *-*-darwin*) with_osx=yes ;;
   *-*-freebsd*) with_freebsd=yes ;;
+  *-*-mingw* | *-*-msvc* ) with_win=yes ;;
 esac
 
 if test $with_linux = no; then
@@ -194,6 +195,11 @@ fi
 AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"])
 AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"])
 
+# We don't support the daemon yet
+if test "$with_win" = "yes" ; then
+  with_libvirtd=no
+fi
+
 # The daemon requires remote support.  Likewise, if we are not using
 # RPC, we don't need several libraries.
 if test "$with_remote" = "no" ; then