diff --git a/CMakeLists.txt b/CMakeLists.txt
index 357690a2d..3e469c386 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,8 @@ option(CITRON_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
 
 option(CITRON_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)
 
+option(CITRON_USE_AUTO_UPDATER "Enable automatic updater functionality" OFF)
+
 option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
 
 option(ENABLE_OPENAL "Enables the OpenAL audio backend" ON)
diff --git a/src/citron/CMakeLists.txt b/src/citron/CMakeLists.txt
index a968192bb..850e7d97b 100644
--- a/src/citron/CMakeLists.txt
+++ b/src/citron/CMakeLists.txt
@@ -210,11 +210,6 @@ add_executable(citron
     startup_checks.h
     uisettings.cpp
     uisettings.h
-    updater/updater_service.cpp
-    updater/updater_service.h
-    updater/updater_dialog.cpp
-    updater/updater_dialog.h
-    updater/updater_dialog.ui
     util/clickable_label.cpp
     util/clickable_label.h
     util/controller_navigation.cpp
@@ -252,6 +247,21 @@ if (CITRON_CRASH_DUMPS)
     target_compile_definitions(citron PRIVATE CITRON_CRASH_DUMPS)
 endif()
 
+if (CITRON_USE_AUTO_UPDATER)
+    target_sources(citron PRIVATE
+        updater/updater_service.cpp
+        updater/updater_service.h
+        updater/updater_dialog.cpp
+        updater/updater_dialog.h
+        updater/updater_dialog.ui
+    )
+
+    target_compile_definitions(citron PRIVATE
+        # Ensure _WIN32 is defined for moc processing on Windows
+        $<$<BOOL:${WIN32}>:_WIN32>
+    )
+endif()
+
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     target_compile_definitions(citron PRIVATE
         $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:CANNOT_EXPLICITLY_INSTANTIATE>