diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes
index e3a90d6..da1d30e 100644
--- a/plasma5-workspace.changes
+++ b/plasma5-workspace.changes
@@ -5,6 +5,7 @@ Tue Mar 29 16:21:08 UTC 2016 - hrvoje.senjan@gmail.com
   * New bugfix release
   * For more details please see:
     https://www.kde.org/announcements/plasma-5.6.1.php
+- Drop upstreamed xembedsniproxy-avoid-ghost-entry.patch
 
 -------------------------------------------------------------------
 Sun Mar 20 09:19:59 UTC 2016 - hrvoje.senjan@gmail.com
diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec
index 357bb60..223e358 100644
--- a/plasma5-workspace.spec
+++ b/plasma5-workspace.spec
@@ -36,6 +36,8 @@ Patch1:         create_kdehome.patch
 Patch2:         fix-breeze-sddm-theme-with-many-users.patch
 # PATCH-FIX_OPENSUSE kuiserver5_qApp.patch -- kuiserver can't be a QCoreApplications as it uses QWidget
 Patch3:         kuiserver5_qApp.patch
+# PATCH-FIX-OPENSUSE plasmashell-disable-windowclosing-on-logout.patch kde#349805 wbauer@tmo.at -- Prevent plasma from closing too early on logout resulting in an unusable desktop if the logout is cancelled
+Patch4:         plasmashell-disable-windowclosing-on-logout.patch
 # PATCHES 100-200 and above are from upstream 5.6 branch
 # PATCHES 201-300 and above are from upstream master/5.7 branch
 BuildRequires:  kf5-filesystem
@@ -206,6 +208,7 @@ workspace. Development files.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
   %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5
diff --git a/plasmashell-disable-windowclosing-on-logout.patch b/plasmashell-disable-windowclosing-on-logout.patch
new file mode 100644
index 0000000..5376e7f
--- /dev/null
+++ b/plasmashell-disable-windowclosing-on-logout.patch
@@ -0,0 +1,47 @@
+From: Andreas Hartmetz <ahartmetz@gmail.com>
+Date: Sat, 20 Feb 2016 20:01:42 +0000
+Subject: Disable fallback session management (requires Qt >= 5.6.0).
+X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=b5e814a7b2867914327c889794b1088027aaafd6
+---
+Disable fallback session management (requires Qt >= 5.6.0).
+
+This prevents processes from dying when session logout is cancelled.
+Session restore is not an issue in these, it's disabled anyway.
+---
+
+
+--- a/klipper/main.cpp
++++ b/klipper/main.cpp
+@@ -73,7 +73,7 @@
+ 
+   KAboutData::setApplicationData(aboutData);
+ 
+-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
++#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 1)
+   QGuiApplication::setFallbackSessionManagementEnabled(false);
+ #endif
+   auto disableSessionManagement = [](QSessionManager &sm) {
+--- a/krunner/main.cpp
++++ b/krunner/main.cpp
+@@ -66,7 +66,7 @@
+ 
+     KAboutData::setApplicationData(aboutData);
+ 
+-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
++#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 1)
+     QGuiApplication::setFallbackSessionManagementEnabled(false);
+ #endif
+     auto disableSessionManagement = [](QSessionManager &sm) {
+diff --git a/shell/main.cpp b/shell/main.cpp
+index 49ea484..68cf9e9 100644
+--- a/shell/main.cpp
++++ b/shell/main.cpp
+@@ -101,7 +101,7 @@
+     cliOptions.process(app);
+     aboutData.processCommandLine(&cliOptions);
+ 
+-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
++#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 1)
+     QGuiApplication::setFallbackSessionManagementEnabled(false);
+ #endif
+     auto disableSessionManagement = [](QSessionManager &sm) {