diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32917ea..081eaea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -309,6 +309,7 @@
 
 if(WIN32)
   add_subdirectory(win)
+  include(win/installer/BuildInstaller.cmake)
 else()
   # No interest in building x related parts on Apple
   if(NOT APPLE)
diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt
index 0bd5a3a..61afe4d 100644
--- a/win/CMakeLists.txt
+++ b/win/CMakeLists.txt
@@ -12,5 +12,3 @@
 add_subdirectory(vncconfig)
 add_subdirectory(winvnc)
 endif()
-
-add_subdirectory(installer)
diff --git a/win/installer/CMakeLists.txt b/win/installer/BuildInstaller.cmake
similarity index 83%
rename from win/installer/CMakeLists.txt
rename to win/installer/BuildInstaller.cmake
index 56f52a2..dfb44e8 100644
--- a/win/installer/CMakeLists.txt
+++ b/win/installer/BuildInstaller.cmake
@@ -1,3 +1,6 @@
+# This file is included from the top-level CMakeLists.txt.  We just store it
+# here to avoid cluttering up that file.
+
 # Detect a 64-bit build and give that installer a different name
 if(CMAKE_SIZEOF_VOID_P MATCHES 8)
   set(INST_NAME ${CMAKE_PROJECT_NAME}64-${VERSION})
@@ -25,7 +28,7 @@
   set(INST_DEFS ${INST_DEFS} -DHAVE_GNUTLS)
 endif()
 
-configure_file(tigervnc.iss.in tigervnc.iss)
+configure_file(win/installer/tigervnc.iss.in tigervnc.iss)
 
 add_custom_target(installer
   iscc -o${INSTALLERDIR} ${INST_DEFS} ${BUILDDIRDEF} -F${INST_NAME} tigervnc.iss