diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,6 +149,7 @@
 add_subdirectory(klipper)
 add_subdirectory(krunner)
 add_subdirectory(ksmserver)
+add_subdirectory(logout-greeter)
 add_subdirectory(ksplash)
 add_subdirectory(systemmonitor)
 add_subdirectory(statusnotifierwatcher)
diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt
--- a/ksmserver/CMakeLists.txt
+++ b/ksmserver/CMakeLists.txt
@@ -10,7 +10,6 @@
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-add_subdirectory(logout-greeter)
 if(BUILD_TESTING)
    add_subdirectory(tests)
 endif()
diff --git a/ksmserver/logout-greeter/CMakeLists.txt b/logout-greeter/CMakeLists.txt
rename from ksmserver/logout-greeter/CMakeLists.txt
rename to logout-greeter/CMakeLists.txt
--- a/ksmserver/logout-greeter/CMakeLists.txt
+++ b/logout-greeter/CMakeLists.txt
@@ -1,5 +1,10 @@
-set(KSMSERVER_LOGOUT_GREETER_SRCS main.cpp shutdowndlg.cpp ../ksmserver_debug.cpp)
-add_executable(ksmserver-logout-greeter ${KSMSERVER_LOGOUT_GREETER_SRCS})
+set(LOGOUT_GREETER_SRCS main.cpp shutdowndlg.cpp)
+ecm_qt_declare_logging_category(LOGOUT_GREETER_SRCS HEADER debug.h
+                                IDENTIFIER LOGOUT_GREETER
+                                CATEGORY_NAME kde.logout_greeter
+                                DEFAULT_SEVERITY Info)
+
+add_executable(ksmserver-logout-greeter ${LOGOUT_GREETER_SRCS})
 target_link_libraries(ksmserver-logout-greeter
     PW::KWorkspace
     Qt5::Widgets
diff --git a/ksmserver/logout-greeter/main.cpp b/logout-greeter/main.cpp
rename from ksmserver/logout-greeter/main.cpp
rename to logout-greeter/main.cpp
diff --git a/ksmserver/logout-greeter/shutdowndlg.h b/logout-greeter/shutdowndlg.h
rename from ksmserver/logout-greeter/shutdowndlg.h
rename to logout-greeter/shutdowndlg.h
diff --git a/ksmserver/logout-greeter/shutdowndlg.cpp b/logout-greeter/shutdowndlg.cpp
rename from ksmserver/logout-greeter/shutdowndlg.cpp
rename to logout-greeter/shutdowndlg.cpp
--- a/ksmserver/logout-greeter/shutdowndlg.cpp
+++ b/logout-greeter/shutdowndlg.cpp
@@ -1,6 +1,4 @@
 /*****************************************************************
-ksmserver - the KDE session management server
-
 Copyright 2000 Matthias Ettrich <ettrich@kde.org>
 Copyright 2007 Urs Wolfer <uwolfer @ kde.org>
 
@@ -24,7 +22,6 @@
 ******************************************************************/
 
 #include "shutdowndlg.h"
-#include "ksmserver_debug.h"
 
 #include <QApplication>
 #include <QQuickItem>
@@ -64,6 +61,7 @@
 #include <fixx11h.h>
 
 #include <config-workspace.h>
+#include <debug.h>
 
 #include <KWayland/Client/surface.h>
 #include <KWayland/Client/plasmashell.h>
@@ -155,15 +153,14 @@
     fileName = package.filePath("logoutmainscript");
 
     if (QFile::exists(fileName)) {
-        //qCDebug(KSMSERVER) << "Using QML theme" << fileName;
         setSource(package.fileUrl("logoutmainscript"));
     } else {
-        qCWarning(KSMSERVER) << "Couldn't find a theme for the Shutdown dialog" << fileName;
+        qCWarning(LOGOUT_GREETER) << "Couldn't find a theme for the Shutdown dialog" << fileName;
         return;
     }
 
     if(!errors().isEmpty()) {
-        qCWarning(KSMSERVER) << errors();
+        qCWarning(LOGOUT_GREETER) << errors();
     }
 
     connect(rootObject(), SIGNAL(logoutRequested()), SLOT(slotLogout()));
diff --git a/ksmserver/logout-greeter/tests/CMakeLists.txt b/logout-greeter/tests/CMakeLists.txt
rename from ksmserver/logout-greeter/tests/CMakeLists.txt
rename to logout-greeter/tests/CMakeLists.txt
--- a/ksmserver/logout-greeter/tests/CMakeLists.txt
+++ b/logout-greeter/tests/CMakeLists.txt
@@ -1,3 +1,5 @@
+configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
 add_executable(logout-greeter-test main.cpp)
 target_link_libraries(logout-greeter-test Qt5::Core Qt5::Concurrent)
 ecm_mark_as_test(logout-greeter-test)
diff --git a/logout-greeter/tests/config.h.cmake b/logout-greeter/tests/config.h.cmake
new file mode 100644
--- /dev/null
+++ b/logout-greeter/tests/config.h.cmake
@@ -0,0 +1 @@
+#define LOGOUT_GREETER_BIN "${CMAKE_INSTALL_FULL_LIBEXECDIR}/ksmserver-logout-greeter"
diff --git a/ksmserver/logout-greeter/tests/main.cpp b/logout-greeter/tests/main.cpp
rename from ksmserver/logout-greeter/tests/main.cpp
rename to logout-greeter/tests/main.cpp
--- a/ksmserver/logout-greeter/tests/main.cpp
+++ b/logout-greeter/tests/main.cpp
@@ -31,7 +31,7 @@
 
 #include <unistd.h>
 
-#include <config-ksmserver.h>
+#include <config.h>
 
 static void readFromPipe(int pipe)
 {