diff --git a/extra/qtcreator/PKGBUILD b/extra/qtcreator/PKGBUILD
index ce724d84c..a899793ea 100644
--- a/extra/qtcreator/PKGBUILD
+++ b/extra/qtcreator/PKGBUILD
@@ -15,7 +15,7 @@ buildarch=12
 pkgname=qtcreator
 pkgver=4.2.1
 _pkgver=v4.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
 url='http://qt-project.org'
@@ -28,7 +28,7 @@ optdepends=('qt5-doc: integrated Qt documentation'
             'qt5-translations: for other languages'
             'gdb: debugger'
             'cmake: cmake project support'
-            'openssh-askpass: ssh support'
+            'x11-ssh-askpass: ssh support'
             'git: git support'
             'mercurial: mercurial support'
             'bzr: bazaar support')
@@ -47,7 +47,8 @@ build() {
   [[ -d build ]] && rm -r build
   mkdir build && cd build
 
-  LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr qmake QMAKE_CFLAGS_ISYSTEM=-I CONFIG+=journald -r ../qt-creator-opensource-src-${pkgver}/qtcreator.pro
+  LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr qmake QMAKE_CFLAGS_ISYSTEM=-I \
+    CONFIG+=journald -r ../qt-creator-opensource-src-${pkgver}/qtcreator.pro
   make
   make docs -j1
 }
@@ -58,11 +59,5 @@ package() {
   make INSTALL_ROOT="${pkgdir}/usr/" install
   make INSTALL_ROOT="${pkgdir}/usr/" install_docs
 
-  # Workaround for FS#40583
-  mv "${pkgdir}"/usr/bin/qtcreator "${pkgdir}"/usr/bin/qtcreator-bin
-  echo "#!/bin/sh" > "${pkgdir}"/usr/bin/qtcreator
-  echo "QT_LOGGING_TO_CONSOLE=1 qtcreator-bin \$@" >> "${pkgdir}"/usr/bin/qtcreator
-  chmod +x "${pkgdir}"/usr/bin/qtcreator
-
   install -Dm644 ${srcdir}/qt-creator-opensource-src-${pkgver}/LICENSE.GPL3-EXCEPT ${pkgdir}/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT
 }
diff --git a/extra/qtcreator/qtcreator.desktop b/extra/qtcreator/qtcreator.desktop
deleted file mode 100644
index a8fbbb4d1..000000000
--- a/extra/qtcreator/qtcreator.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=qtcreator %F
-Name=Qt Creator
-GenericName=C++ IDE for developing Qt applications
-X-KDE-StartupNotify=true
-Icon=QtProject-qtcreator
-Terminal=false
-Categories=Development;IDE;Qt;
-MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource;