diff --git a/0004-Workaround-the-lockscreen-password-field-focus-issue.patch b/0004-Workaround-the-lockscreen-password-field-focus-issue.patch
new file mode 100644
index 0000000..6a150ed
--- /dev/null
+++ b/0004-Workaround-the-lockscreen-password-field-focus-issue.patch
@@ -0,0 +1,35 @@
+From 24f24e03793c8214a5d1f3414a5aeb48eccef4f4 Mon Sep 17 00:00:00 2001
+From: Bhushan Shah <bhush94@gmail.com>
+Date: Wed, 25 Mar 2015 21:25:22 +0530
+Subject: [PATCH 4/4] Workaround the lockscreen password field focus issue
+
+Fixes bug 344823
+Backport of a476e1b6bf6f683bd74000bb30076868c9f92371 in 5.2
+
+CCMAIL: release-team@kde.org
+---
+ lookandfeel/contents/lockscreen/LockScreen.qml | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/lookandfeel/contents/lockscreen/LockScreen.qml b/lookandfeel/contents/lockscreen/LockScreen.qml
+index 8b01322..ab554bd 100644
+--- a/lookandfeel/contents/lockscreen/LockScreen.qml
++++ b/lookandfeel/contents/lockscreen/LockScreen.qml
+@@ -156,6 +156,14 @@ Image {
+                             enabled: !authenticator.graceLocked
+                             onAccepted: unlockFunction()
+                             focus: true
++                            //HACK: Similar hack is needed in sddm loginscreen
++                            //TODO: investigate
++                            Timer {
++                                interval: 200
++                                running: true
++                                repeat: false
++                                onTriggered: passwordInput.forceActiveFocus()
++                            }
+                             visible: block.mainItem.model.get(block.mainItem.selectedIndex)["showPassword"]
+                             onVisibleChanged: {
+                                 if (visible) {
+-- 
+1.9.3
+
diff --git a/plasma-workspace.spec b/plasma-workspace.spec
index 43c5b85..e0e3794 100644
--- a/plasma-workspace.spec
+++ b/plasma-workspace.spec
@@ -1,6 +1,6 @@
 Name:           plasma-workspace
 Version:        5.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plasma workspace, applications and applets
 License:        GPLv2+
 URL:            https://projects.kde.org/projects/kde/workspace/plasma-workspace
@@ -22,6 +22,10 @@ Source11:       startkde.cmake
 
 ## upstreamable Patches
 
+## upstream Patches
+# http://commits.kde.org/plasma-workspace/24f24e03793c8214a5d1f3414a5aeb48eccef4f4
+Patch4: 0004-Workaround-the-lockscreen-password-field-focus-issue.patch
+
 # udev
 BuildRequires:  zlib-devel
 BuildRequires:  dbusmenu-qt5-devel
@@ -172,7 +176,7 @@ Documentation and user manuals for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%autosetup -p1
 
 mv startkde/startkde.cmake startkde/startkde.cmake.orig
 install -m644 -p %{SOURCE11} startkde/startkde.cmake
@@ -270,6 +274,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/{plasma-windowed,org
 
 
 %changelog
+* Wed Mar 25 2015 Rex Dieter <rdieter@fedoraproject.org> 5.2.2-2
+- Lockscreen: Password field does not have focus (kde#344823)
+
 * Fri Mar 20 2015 Daniel Vrátil <dvratil@redhat.com> - 5.2.2-1
 - Plasma 5.2.2