diff --git a/fix-logout-button-sizing.patch b/fix-logout-button-sizing.patch
new file mode 100644
index 0000000..db16f32
--- /dev/null
+++ b/fix-logout-button-sizing.patch
@@ -0,0 +1,30 @@
+From: Aleix Pol <aleixpol@kde.org>
+Date: Tue, 15 Sep 2015 09:16:16 +0000
+Subject: Make sure the cancel and shutdown/logout button have the same size
+X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=93bf81eea152e2b8261ac4a854207af448ed7c43
+---
+Make sure the cancel and shutdown/logout button have the same size
+
+REVIEW: 125235
+---
+
+
+--- a/lookandfeel/contents/components/LogoutScreen.qml
++++ b/lookandfeel/contents/components/LogoutScreen.qml
+@@ -130,12 +130,15 @@
+             anchors.centerIn: parent
+ 
+             PlasmaComponents.Button {
++                id: cancelButton
+                 text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Cancel")
+                 onClicked: root.cancel()
++                Layout.preferredWidth: Math.max(commitButton.implicitWidth, cancelButton.implicitWidth)
+             }
+ 
+             PlasmaComponents.Button {
+                 id: commitButton
++                Layout.preferredWidth: Math.max(commitButton.implicitWidth, cancelButton.implicitWidth)
+                 onClicked: root.currentAction()
+                 focus: true
+ 
+
diff --git a/plasma-workspace-5.4.0.tar.xz b/plasma-workspace-5.4.0.tar.xz
deleted file mode 100644
index b82582b..0000000
--- a/plasma-workspace-5.4.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:102e06f9d8c1f2be18aefe009c8d66fa99a1d986f392474490fe37d4d1f3993f
-size 6956048
diff --git a/plasma-workspace-5.4.1.tar.xz b/plasma-workspace-5.4.1.tar.xz
new file mode 100644
index 0000000..23c0555
--- /dev/null
+++ b/plasma-workspace-5.4.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6084d5885d815301115dd18d65c739e8968c3feb854f5d052348b5062a381795
+size 6957164
diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes
index b7ffb70..9858431 100644
--- a/plasma5-workspace.changes
+++ b/plasma5-workspace.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Wed Sep 16 18:39:29 UTC 2015 - lbeltrame@kde.org
+
+- Add fix-logout-button-sizing.patch: Upstream fix to ensure that
+  logout/shutdown and cancel buttons on the logout screen have 
+  all the same size.
+
+-------------------------------------------------------------------
+Thu Sep 10 17:19:32 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.4.1:
+  * For more details please see:
+    https://www.kde.org/announcements/plasma-5.4.1.php
+
+-------------------------------------------------------------------
+Tue Sep  8 10:36:15 UTC 2015 - wbauer@tmo.at
+
+- Add an explicit conflict with kio-extras5 < 15.08.0. Some files
+  from kio-extras5 have been moved to plasma5-workspace in 5.4,
+  this should prevent a possible file conflict. (boo#944656)
+
 -------------------------------------------------------------------
 Mon Aug 24 17:53:13 UTC 2015 - hrvoje.senjan@gmail.com
 
diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec
index caeb8c1..d38295e 100644
--- a/plasma5-workspace.spec
+++ b/plasma5-workspace.spec
@@ -18,7 +18,7 @@
 
 %bcond_without lang
 Name:           plasma5-workspace
-Version:        5.4.0
+Version:        5.4.1
 Release:        0
 Summary:        The KDE Plasma Workspace Components
 License:        GPL-2.0+
@@ -31,8 +31,11 @@ Source99:       %{name}-rpmlintrc
 Patch0:         0001-Rename-qdbus-in-startkde.patch
 # PATCH-FIX_OPENSUSE create_kdehome.patch -- https://bugs.kde.org/show_bug.cgi?id=338422#c8
 Patch1:         create_kdehome.patch
+# PATCH-FIX-UPSTREAM: fix-logout-button-sizing.patch lbeltrame@kde.org -- Ensure all logout buttons have the same size
+Patch2:         fix-logout-button-sizing.patch
 # PATCHES 100-200 and above are from upstream 5.3 branch
 # PATCHES 201-300 and above are from upstream master/5.4 branch
+
 BuildRequires:  alsa-devel
 BuildRequires:  baloo5-devel >= %{version}
 BuildRequires:  kactivities5-devel >= 5.12.0
@@ -90,6 +93,8 @@ BuildRequires:  pkgconfig(xi)
 BuildRequires:  pkgconfig(xrender)
 BuildRequires:  pkgconfig(zlib)
 Conflicts:      kdebase4-workspace < 5.3.0
+# Some files have been moved from kio-extras5 to plasma5-workspace in 5.4. This should prevent a possible file conflict. (boo#944656)
+Conflicts:      kio-extras5 < 15.08.0
 Requires:       %{name}-branding = %{version}
 Requires:       %{name}-libs = %{version}-%{release}
 # used within startup
@@ -187,6 +192,7 @@ workspace. Development files.
 %setup -q -n plasma-workspace-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
   %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5