diff --git a/configure.ac b/configure.ac
index 3ba8a1c..19a6d39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,6 +143,13 @@
 
 AC_CHECK_HEADERS([sys/select.h])
 
+# Needed for WinVNC, but not part of mingw yet
+AC_CHECK_DECLS([CLSID_ActiveDesktop], [BUILD_WINVNC=yes], [],
+	       [[#include <windows.h>
+	         #include <shlguid.h>
+	         ]])
+AM_CONDITIONAL([BUILD_WINVNC], [ test "x$BUILD_WINVNC" = xyes ])
+
 AC_OUTPUT([
 Makefile
 common/Makefile
diff --git a/win/Makefile.am b/win/Makefile.am
index 4aa1cde..7f2d96c 100644
--- a/win/Makefile.am
+++ b/win/Makefile.am
@@ -1,3 +1,7 @@
-SUBDIRS = rfb_win32 vncviewer vncconfig winvnc
+SUBDIRS = rfb_win32 vncviewer
+
+if BUILD_WINVNC
+SUBDIRS += vncconfig winvnc
+endif
 
 EXTRA_DIST = logmessages/messages.h
diff --git a/win/rfb_win32/Makefile.am b/win/rfb_win32/Makefile.am
index 3d8545a..74f74e8 100644
--- a/win/rfb_win32/Makefile.am
+++ b/win/rfb_win32/Makefile.am
@@ -4,7 +4,6 @@
   AboutDialog.h \
   BitmapInfo.h \
   CKeyboard.h \
-  CleanDesktop.h \
   Clipboard.h \
   CompatibleBitmap.h \
   ComputerName.h \
@@ -58,7 +57,6 @@
 librfb_win32_la_SOURCES = $(HDRS) \
   AboutDialog.cxx \
   CKeyboard.cxx \
-  CleanDesktop.cxx \
   Clipboard.cxx \
   CPointer.cxx \
   CurrentUser.cxx \
@@ -97,5 +95,12 @@
   WMShatter.cxx \
   WMWindowCopyRect.cxx
 
+# These files rely on features not yet in upstream mingw
+if BUILD_WINVNC
+librfb_win32_la_SOURCES += \
+  CleanDesktop.h \
+  CleanDesktop.cxx
+endif
+
 librfb_win32_la_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win
 librfb_win32_la_LIBADD =