diff --git a/Makefile.am b/Makefile.am
index 0fc5ae173..b184f1165 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,8 +7,10 @@ if BUILD_CLI
   CLI_DIR = cli
 endif
 if BUILD_DAEMON
+if !WIN32
   DAEMON_DIR = daemon
 endif
+endif
 if BUILD_GTK
   GTK_DIR = gtk po
 endif
diff --git a/configure.ac b/configure.ac
index 5b90eea7b..1e7075b8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -313,7 +313,7 @@ fi
 if test "x$have_msw" = "xyes"; then
     AC_DEFINE([HAVE_MSW], 1)
 fi
-
+AM_CONDITIONAL(WIN32, test "x$have_msw" = "xyes")
 
 dnl ----------------------------------------------------------------------------
 dnl