diff --git a/CMakeLists.txt b/CMakeLists.txt
index a023a8a63..79fd6eddd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -392,6 +392,7 @@ elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable")
 elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DownloaderExecutable")
 	set(DOWNLOADER_APP
 		subsurface-downloader-main.cpp
+		cli-downloader.cpp
 	)
 	source_group("Downloader App" FILES ${DOWNLOADER_APP})
 	add_executable(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${DOWNLOADER_APP} ${SUBSURFACE_RESOURCES})
diff --git a/core/cli-downloader.cpp b/cli-downloader.cpp
similarity index 100%
rename from core/cli-downloader.cpp
rename to cli-downloader.cpp
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 51ccf608f..1ed24019c 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -20,10 +20,6 @@ if(FTDISUPPORT)
 	set(SERIAL_FTDI serial_ftdi.c)
 endif()
 
-if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DownloaderExecutable")
-	set(DOWNLOADER cli-downloader.cpp)
-endif()
-
 if(BTSUPPORT)
 	add_definitions(-DBT_SUPPORT)
 	set(BT_SRC_FILES desktop-widgets/btdeviceselectiondialog.cpp)
@@ -256,7 +252,6 @@ set(SUBSURFACE_CORE_LIB_SRCS
 	${SERIAL_FTDI}
 	${PLATFORM_SRC}
 	${BT_CORE_SRC_FILES}
-	${DOWNLOADER}
 )
 source_group("Subsurface Core" FILES ${SUBSURFACE_CORE_LIB_SRCS})