diff --git a/ksmserver/ksmserver.service.cmake b/ksmserver/ksmserver.service.cmake
index cc098ab1e..3e9717042 100644
--- a/ksmserver/ksmserver.service.cmake
+++ b/ksmserver/ksmserver.service.cmake
@@ -1,6 +1,10 @@
 [Unit]
 Description=KDE Session Management Server
+Wants=kcminit.service
 
 [Service]
 ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/ksmserver
 BusName=org.kde.ksmserver
+
+[Install]
+WantedBy=plasma-core.target
diff --git a/shell/plasmashell.service.cmake b/shell/plasmashell.service.cmake
index a7eec3191..ecbabe664 100644
--- a/shell/plasmashell.service.cmake
+++ b/shell/plasmashell.service.cmake
@@ -1,13 +1,13 @@
 [Unit]
 Description=KDE Plasma Workspace
-#   Requires=ksmserver.service
+Wants=ksmserver.service kcminit.service
 #kded.service kactivitymanagerd.service
 
 [Service]
 ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/plasmashell --no-respawn
 Restart=on-failure
 KillMode=none
 BusName=org.kde.plasmashell
 
 [Install]
-Alias=plasma-workspace.service
+WantedBy=plasma-core.target
diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt
index 65f2cd192..43c162c7b 100644
--- a/startkde/CMakeLists.txt
+++ b/startkde/CMakeLists.txt
@@ -1,39 +1,40 @@
 add_subdirectory(kcminit)
 add_subdirectory(ksyncdbusenv)
 add_subdirectory(waitforname)
 
 add_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII)
 add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 qt5_add_dbus_interface(
     startplasma_SRCS
     ${CMAKE_SOURCE_DIR}/ksplash/ksplashqml/org.kde.KSplash.xml
     ksplashinterface
 )
 
 add_executable(startplasma-x11 startplasma.cpp startplasma-x11.cpp kcheckrunning/kcheckrunning.cpp ${startplasma_SRCS})
 add_executable(startplasma-wayland startplasma.cpp startplasma-wayland.cpp ${startplasma_SRCS})
 add_executable(startplasma-waylandsession startplasma.cpp startplasma-waylandsession.cpp ${startplasma_SRCS})
 
 target_include_directories(startplasma-x11 PRIVATE ${X11_X11_INCLUDE_PATH})
 target_link_libraries(startplasma-x11 PRIVATE Qt5::Core Qt5::DBus KF5::ConfigCore
     ${X11_X11_LIB} # for kcheckrunning
 )
 target_link_libraries(startplasma-wayland PRIVATE Qt5::Core Qt5::DBus KF5::ConfigCore)
 target_link_libraries(startplasma-waylandsession PRIVATE Qt5::Core Qt5::DBus KF5::ConfigCore)
 add_subdirectory(plasma-session)
 
 #FIXME: reconsider, looks fishy
 if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
     set_property(SOURCE startplasma.cpp APPEND PROPERTY COMPILE_DEFINITIONS
         XCURSOR_PATH="${KDE_INSTALL_FULL_DATAROOTDIR}/icons:$XCURSOR_PATH:~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons")
 endif()
 
 configure_file(config-startplasma.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-startplasma.h)
 
 install(TARGETS startplasma-x11 ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(TARGETS startplasma-wayland ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(TARGETS startplasma-waylandsession DESTINATION ${KDE_INSTALL_LIBEXECDIR})
 install(PROGRAMS plasma-sourceenv.sh DESTINATION ${KDE_INSTALL_LIBEXECDIR})
 install(FILES  plasma-workspace.target DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR})
+install(FILES  plasma-base.target DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR})
diff --git a/startkde/plasma-base.target b/startkde/plasma-base.target
new file mode 100644
index 000000000..8a71acdc1
--- /dev/null
+++ b/startkde/plasma-base.target
@@ -0,0 +1,3 @@
+[Unit]
+Description=KDE Plasma Workspace
+Requires=plasma-core.target
diff --git a/startkde/plasma-core.target b/startkde/plasma-core.target
new file mode 100644
index 000000000..78e2d7173
--- /dev/null
+++ b/startkde/plasma-core.target
@@ -0,0 +1,3 @@
+[Unit]
+Description=KDE Plasma Workspace
+Requires=plasmashell.service kwin.service ksmserver.service kcminit.service kded.service