diff --git a/kde-cli-tools5.changes b/kde-cli-tools5.changes
index 28c82fe..96efb68 100644
--- a/kde-cli-tools5.changes
+++ b/kde-cli-tools5.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jul 22 10:43:13 UTC 2016 - wbauer@tmo.at
+
+- Add kdesu-Do-not-change-minimum-size.patch to prevent the
+  displayed command line text running into the password field
+  (boo#958785)
+
 -------------------------------------------------------------------
 Wed Jul 20 08:54:18 UTC 2016 - hrvoje.senjan@gmail.com
 
diff --git a/kde-cli-tools5.spec b/kde-cli-tools5.spec
index 8e5a700..aa48fd4 100644
--- a/kde-cli-tools5.spec
+++ b/kde-cli-tools5.spec
@@ -27,6 +27,8 @@ Url:            http://www.kde.org
 Source:         kde-cli-tools-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE kdesu-add-some-i18n-love.patch -- boo#852256
 Patch0:         kdesu-add-some-i18n-love.patch
+# PATCH-FIX-UPSTREAM kdesu-Do-not-change-minimum-size.patch boo#958785 -- prevent the displayed command line text running into the password field
+Patch1:         kdesu-Do-not-change-minimum-size.patch
 BuildRequires:  extra-cmake-modules >= 1.3.0
 BuildRequires:  kf5-filesystem
 BuildRequires:  xz
@@ -63,6 +65,7 @@ Additional CLI tools for KDE applications and workspaces.
 %prep
 %setup -q -n kde-cli-tools-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
   %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
diff --git a/kdesu-Do-not-change-minimum-size.patch b/kdesu-Do-not-change-minimum-size.patch
new file mode 100644
index 0000000..8030bb1
--- /dev/null
+++ b/kdesu-Do-not-change-minimum-size.patch
@@ -0,0 +1,23 @@
+From: Christoph Feck <cfeck@kde.org>
+Date: Thu, 21 Jul 2016 21:34:02 +0000
+Subject: Do not change minimumSize()
+X-Git-Url: http://quickgit.kde.org/?p=kde-cli-tools.git&a=commitdiff&h=dc023ba3cbd6e6fcbe8a6b13e1796a2c0744a5a2
+---
+Do not change minimumSize()
+
+KPasswordDialog knows better.
+---
+
+
+--- a/kdesu/sudlg.cpp
++++ b/kdesu/sudlg.cpp
+@@ -59,8 +59,6 @@
+     if( withIgnoreButton ) {
+         connect(buttonBox()->button(QDialogButtonBox::Ignore), SIGNAL(clicked()), SLOT(slotUser1()));
+     }
+-
+-    setMinimumSize(minimumSizeHint());
+ }
+ 
+ 
+