diff --git a/kde-workspace.spec b/kde-workspace.spec
index 8926109..bf0d4a9 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -11,15 +11,15 @@
 %define systemd_login1 1
 %endif
 
-%if 0%{?fedora} < 24
+#if 0%{?fedora} < 24
 %define kdm 1
-%endif
+#endif
 
 Summary: KDE Workspace
 Name:    kde-workspace
 Epoch:   1
 Version: 4.11.22
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -81,21 +81,15 @@ BuildRequires: kactivities-devel
 BuildConflicts: nepomuk-core-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libutempter-devel
-#ifnarch s390 s390x
-#BuildRequires: lm_sensors-devel
-#endif
 BuildRequires: pam-devel
 
 # TODO: Can we strip this even more?
-#BuildRequires: pkgconfig(bluez)
 BuildRequires: pkgconfig(dbusmenu-qt)
 BuildRequires: pkgconfig(gl)
 BuildRequires: pkgconfig(libpng)
 BuildRequires: pkgconfig(libstreamanalyzer)
 BuildRequires: pkgconfig(libudev)
 BuildRequires: pkgconfig(libxklavier)
-# added libnm-glib to workaround https://bugzilla.redhat.com/show_bug.cgi?id=685442
-#BuildRequires: pkgconfig(polkit-qt-1)
 BuildRequires: pkgconfig(qimageblitz)
 BuildRequires: pkgconfig(xau)
 BuildRequires: pkgconfig(xcb)
@@ -278,7 +272,10 @@ for lib in kephal oxygen plasmaclock plasmagenericshell taskmanager; do
 done
 
 # make libs/kdm optional
-sed -i -e 's/add_subdirectory(kdm)/macro_optional_add_subdirectory(kdm)/' libs/CMakeLists.txt doc/CMakeLists.txt
+sed -i -e 's/add_subdirectory(kdm)/macro_optional_add_subdirectory(kdm)/' \
+  kdm/CMakeLists.txt \
+  libs/CMakeLists.txt \
+  doc/CMakeLists.txt
 
 # Disable all docs except for KDM and kcontrol
 for doc in klipper kfontview kmenuedit ksysguard plasma-desktop systemsettings kinfocenter PolicyKit-kde; do
@@ -298,11 +295,12 @@ for kcm in randr keyboard bell input access screensaver dateandtime autostart la
     sed -i "/add_subdirectory( $kcm )/s/^/#/" kcontrol/CMakeLists.txt
 done
 
-# Disable KDM KCM (useless in Plasma 5)
-sed -i "/add_subdirectory(kcm)/s/^/#/" kdm/CMakeLists.txt
-
 
 %build
+
+# workaround bug #1316964
+export CFLAGS="%{optflags} -Dinline=__inline__"
+
 mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} .. \
@@ -435,6 +433,16 @@ rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kcontrol/colors/
 %{_kde4_appsdir}/kdm/faces/
 %{_kde4_appsdir}/kdm/pics/
 %dir %{_kde4_appsdir}/kdm/themes/
+# kcm
+%{_kde4_appsdir}/kcontrol/
+%{_kde4_appsdir}/kdm/
+%{_kde4_libdir}/kde4/kcm_kdm.so
+%{_kde4_libexecdir}/kcmkdmhelper
+%{_kde4_datadir}/config/background.knsrc
+%{_kde4_datadir}/config/kdm.knsrc
+%{_kde4_datadir}/dbus-1/system-services/org.kde.kcontrol.kcmkdm.service
+%{_kde4_datadir}/kde4/services/kdm.desktop
+%{_kde4_datadir}/polkit-1/actions/org.kde.kcontrol.kcmkdm.policy
 
 %files -n kdm-themes
 %{_kde4_appsdir}/kdm/themes/ariya/
@@ -477,6 +485,11 @@ rm -rfv %{buildroot}%{_kde4_docdir}/HTML/en/kcontrol/colors/
 
 
 %changelog
+* Sat Mar 12 2016 Rex Dieter <rdieter@fedoraproject.org> - 1:4.11.22-6
+- re-enable kdm (and kcm_kdm)
+- workaround systemd bug #1316964
+- drop a few more unused BuildRequires
+
 * Fri Mar 11 2016 Rex Dieter <rdieter@fedoraproject.org> 1:4.11.22-5
 - drop kdm f24+