diff --git a/Applications/CMakeLists.txt b/Applications/CMakeLists.txt
index 76d2ae304e..3cac484069 100644
--- a/Applications/CMakeLists.txt
+++ b/Applications/CMakeLists.txt
@@ -2,7 +2,6 @@ add_subdirectory(About)
 add_subdirectory(Browser)
 add_subdirectory(Calculator)
 add_subdirectory(Calendar)
-add_subdirectory(CrashDaemon)
 add_subdirectory(CrashReporter)
 add_subdirectory(Debugger)
 add_subdirectory(DisplaySettings)
diff --git a/Services/CMakeLists.txt b/Services/CMakeLists.txt
index 087cac6728..26003a7d55 100644
--- a/Services/CMakeLists.txt
+++ b/Services/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_subdirectory(AudioServer)
 add_subdirectory(ChessEngine)
 add_subdirectory(Clipboard)
+add_subdirectory(CrashDaemon)
 add_subdirectory(DHCPClient)
 add_subdirectory(EchoServer)
 add_subdirectory(ImageDecoder)
diff --git a/Applications/CrashDaemon/CMakeLists.txt b/Services/CrashDaemon/CMakeLists.txt
similarity index 100%
rename from Applications/CrashDaemon/CMakeLists.txt
rename to Services/CrashDaemon/CMakeLists.txt
diff --git a/Applications/CrashDaemon/main.cpp b/Services/CrashDaemon/main.cpp
similarity index 100%
rename from Applications/CrashDaemon/main.cpp
rename to Services/CrashDaemon/main.cpp