diff --git a/srcpkgs/kde-workspace/files/kde-np.pam b/srcpkgs/kde-workspace/files/kde-np.pam
index 8b5fdc8fea..b709211a66 100644
--- a/srcpkgs/kde-workspace/files/kde-np.pam
+++ b/srcpkgs/kde-workspace/files/kde-np.pam
@@ -1,19 +1,9 @@
 #%PAM-1.0
-auth		required	pam_tally.so	onerr=succeed
+auth		required	pam_tally.so	onerr=succeed file=/var/log/faillog
 auth		required	pam_shells.so
 auth		requisite	pam_nologin.so
 auth		required	pam_env.so
 auth		optional	pam_permit.so
-
-account 	required	pam_access.so
-account 	required	pam_unix.so
-
-session 	required	pam_env.so
-session 	required	pam_motd.so
-session 	optional	pam_mail.so 	dir=/var/mail standard
-session 	required	pam_unix.so
--session	optional	pam_systemd.so	kill-session-processes=1
--session	optional	pam_ck_connector.so nox11
-session 	required	pam_limits.so
-
-password	required	pam_unix.so 	sha512 shadow nullok try_first_pass use_auth_ok
+account		include 	system-login
+password	include 	system-login
+session		include 	system-login
diff --git a/srcpkgs/kde-workspace/files/kde.pam b/srcpkgs/kde-workspace/files/kde.pam
index 9b3a8572c8..cfdbef0de0 100644
--- a/srcpkgs/kde-workspace/files/kde.pam
+++ b/srcpkgs/kde-workspace/files/kde.pam
@@ -1,17 +1,5 @@
 #%PAM-1.0
-auth 		requisite	pam_nologin.so
-auth 		required	pam_securetty.so
-auth 		required	pam_unix.so
-
-account 	required	pam_access.so
-account 	required	pam_unix.so
-
-session 	required	pam_env.so
-session 	required	pam_motd.so
-session 	optional	pam_mail.so 	dir=/var/mail standard
-session 	required	pam_unix.so
--session	optional	pam_systemd.so	kill-session-processes=1
--session	optional	pam_ck_connector.so nox11
-session 	required	pam_limits.so
-
-password	required	pam_unix.so 	sha512 shadow nullok try_first_pass use_auth_ok
+auth		include		system-login
+account		include		system-login
+password	include		system-login
+session		include		system-login
diff --git a/srcpkgs/kde-workspace/files/kscreensaver.pam b/srcpkgs/kde-workspace/files/kscreensaver.pam
index b4d80c21fc..90e170b93b 100644
--- a/srcpkgs/kde-workspace/files/kscreensaver.pam
+++ b/srcpkgs/kde-workspace/files/kscreensaver.pam
@@ -1 +1 @@
-auth		required	pam_unix_auth.so
+auth            include         system-login
diff --git a/srcpkgs/kde-workspace/patches/khotkeys-qt4.patch b/srcpkgs/kde-workspace/patches/khotkeys-qt4.patch
new file mode 100644
index 0000000000..bc93f9a5dd
--- /dev/null
+++ b/srcpkgs/kde-workspace/patches/khotkeys-qt4.patch
@@ -0,0 +1,22 @@
+--- khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp~	2014-03-05 18:41:23.126818552 +0000
++++ khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp	2014-03-05 18:42:05.563172036 +0000
+@@ -117,7 +117,7 @@
+ 
+ void DbusActionWidget::launchDbusBrowser() const
+     {
+-    if( KRun::runCommand( "qdbusviewer", window()) == 0 )
++    if( KRun::runCommand( "qdbusviewer-qt4", window()) == 0 )
+         {
+         KMessageBox::sorry( window(), i18n( "Failed to run qdbusviewer" ));
+         }
+--- khotkeys/libkhotkeysprivate/actions/dbus_action.cpp~	2014-03-05 18:41:29.120107842 +0000
++++ khotkeys/libkhotkeysprivate/actions/dbus_action.cpp	2014-03-05 18:41:52.349936188 +0000
+@@ -133,7 +133,7 @@
+         }
+     kDebug() << "D-Bus call:" << _application << ":" << _object << ":" << _function << ":" << args_list;
+     KProcess proc;
+-    proc << "qdbus" << _application << _object << _function << args_list;
++    proc << "qdbus-qt4" << _application << _object << _function << args_list;
+     proc.startDetached();
+     }
+ 
diff --git a/srcpkgs/kde-workspace/template b/srcpkgs/kde-workspace/template
index 050efcee52..c691cd6e7a 100644
--- a/srcpkgs/kde-workspace/template
+++ b/srcpkgs/kde-workspace/template
@@ -1,15 +1,16 @@
 # Template file for 'kde-workspace'
 _kdeversion=4.14.3
+_kappversion=15.04.1
 
 pkgname=kde-workspace
-version=4.11.14
+version=4.11.19
 revision=1
 short_desc="Provides the interface and basic tools for the KDE workspace"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL, LGPL, FDL"
 homepage="http://www.kde.org"
-distfiles="http://download.kde.org/stable/${_kdeversion}/src/${pkgname}-${version}.tar.xz"
-checksum=cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01
+distfiles="http://download.kde.org/stable/applications/${_kappversion}/src/${pkgname}-${version}.tar.xz"
+checksum=1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2
 
 build_style=cmake
 configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc