diff --git a/.travis/linux/upload.sh b/.travis/linux/upload.sh
index e9150d7a07..058c41dff9 100755
--- a/.travis/linux/upload.sh
+++ b/.travis/linux/upload.sh
@@ -9,7 +9,7 @@ COMPRESSION_FLAGS="-cJvf"
 mkdir "$REV_NAME"
 
 cp build/src/citra/citra "$REV_NAME"
-cp build/src/citra/citra-room "$REV_NAME"
+cp build/src/dedicated_room/citra-room "$REV_NAME"
 cp build/src/citra_qt/citra-qt "$REV_NAME"
 
 # We need icons on Linux for .desktop entries
diff --git a/.travis/macos/upload.sh b/.travis/macos/upload.sh
index fa2380fc2a..1f928c03cc 100755
--- a/.travis/macos/upload.sh
+++ b/.travis/macos/upload.sh
@@ -10,7 +10,7 @@ mkdir "$REV_NAME"
 
 cp build/src/citra/citra "$REV_NAME"
 cp -r build/src/citra_qt/citra-qt.app "$REV_NAME"
-cp build/src/citra/citra-room "$REV_NAME"
+cp build/src/dedicated_room/citra-room "$REV_NAME"
 
 # move qt libs into app bundle for deployment
 $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app"
diff --git a/src/dedicated_room/CMakeLists.txt b/src/dedicated_room/CMakeLists.txt
index 60ae42f6e7..d956c20cc7 100644
--- a/src/dedicated_room/CMakeLists.txt
+++ b/src/dedicated_room/CMakeLists.txt
@@ -1,13 +1,12 @@
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
 
-set(SRCS
-            citra-room.cpp
-            citra-room.rc
-            )
+add_executable(citra-room
+    citra-room.cpp
+    citra-room.rc
+)
 
-create_directory_groups(${SRCS})
+create_target_directory_groups(citra-room)
 
-add_executable(citra-room ${SRCS})
 target_link_libraries(citra-room PRIVATE common core network)
 target_link_libraries(citra-room PRIVATE glad)
 if (MSVC)