diff --git a/mingw-w64-octopi-git/0001-Hack-isRootRunning-to-always-be-false-for-_WIN32.patch b/mingw-w64-octopi-git/0001-Hack-isRootRunning-to-always-be-false-for-_WIN32.patch
index 8d509d9dd3..fc42adb234 100644
--- a/mingw-w64-octopi-git/0001-Hack-isRootRunning-to-always-be-false-for-_WIN32.patch
+++ b/mingw-w64-octopi-git/0001-Hack-isRootRunning-to-always-be-false-for-_WIN32.patch
@@ -1,7 +1,7 @@
-From 7754262edf79abe82ecf8afa03c9177fc4afed6e Mon Sep 17 00:00:00 2001
+From eb558ba306b49c3ccd8cf4c9e86c9b29fcfcb53c Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 27 Feb 2014 17:00:08 +0000
-Subject: [PATCH 1/4] Hack isRootRunning() to always be false for _WIN32
+Subject: [PATCH 1/5] Hack isRootRunning() to always be false for _WIN32
 
 ---
  src/unixcommand.h | 4 ++++
diff --git a/mingw-w64-octopi-git/0002-Define-QT_WA-as-unicode.patch b/mingw-w64-octopi-git/0002-Define-QT_WA-as-unicode.patch
index 7889800da6..70d1f5849a 100644
--- a/mingw-w64-octopi-git/0002-Define-QT_WA-as-unicode.patch
+++ b/mingw-w64-octopi-git/0002-Define-QT_WA-as-unicode.patch
@@ -1,7 +1,7 @@
-From 2b9cff41aa6dbd8105da7d2458c8b58e9ec25e9c Mon Sep 17 00:00:00 2001
+From 8099185d9d98b509a633a3269f68ce447a7b4451 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 27 Feb 2014 17:06:21 +0000
-Subject: [PATCH 2/4] Define QT_WA() as unicode
+Subject: [PATCH 2/5] Define QT_WA() as unicode
 
 ---
  src/QtSolutions/qtlockedfile_win.cpp | 4 ++++
diff --git a/mingw-w64-octopi-git/0003-Use-Q_PID-for-m_pidTerminal.patch b/mingw-w64-octopi-git/0003-Use-Q_PID-for-m_pidTerminal.patch
index 066d6b5438..332160b519 100644
--- a/mingw-w64-octopi-git/0003-Use-Q_PID-for-m_pidTerminal.patch
+++ b/mingw-w64-octopi-git/0003-Use-Q_PID-for-m_pidTerminal.patch
@@ -1,7 +1,7 @@
-From 6df80c7c5ee050a0950cfa21e564383218e0ac28 Mon Sep 17 00:00:00 2001
+From f6cb0dc2ae15b92def14fd5b6908123a90a01b26 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 27 Feb 2014 17:07:39 +0000
-Subject: [PATCH 3/4] Use Q_PID for m_pidTerminal
+Subject: [PATCH 3/5] Use Q_PID for m_pidTerminal
 
 ---
  src/QtSolutions/qtlockedfile_win.cpp | 2 --
diff --git a/mingw-w64-octopi-git/0004-Hack-out-ProcessWrapper-onSingleShot-to-do-nothing-o.patch b/mingw-w64-octopi-git/0004-Hack-out-ProcessWrapper-onSingleShot-to-do-nothing-o.patch
index 44931cd09d..164e7f929d 100644
--- a/mingw-w64-octopi-git/0004-Hack-out-ProcessWrapper-onSingleShot-to-do-nothing-o.patch
+++ b/mingw-w64-octopi-git/0004-Hack-out-ProcessWrapper-onSingleShot-to-do-nothing-o.patch
@@ -1,7 +1,7 @@
-From 25ed48f7ae5b98fa21793a2ce94c09a52123cb5a Mon Sep 17 00:00:00 2001
+From 1a9c8fc2e4d7547a4f0f10b01dfd57b4ffcda31f Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 27 Feb 2014 17:15:34 +0000
-Subject: [PATCH 4/4] Hack out ProcessWrapper::onSingleShot() to do nothing on
+Subject: [PATCH 4/5] Hack out ProcessWrapper::onSingleShot() to do nothing on
  _WIN32
 
 ---
diff --git a/mingw-w64-octopi-git/0005-Hardcode-relative-path-to-sh.exe-as-getSUCommand-for.patch b/mingw-w64-octopi-git/0005-Hardcode-relative-path-to-sh.exe-as-getSUCommand-for.patch
new file mode 100644
index 0000000000..4a25b9b5ef
--- /dev/null
+++ b/mingw-w64-octopi-git/0005-Hardcode-relative-path-to-sh.exe-as-getSUCommand-for.patch
@@ -0,0 +1,27 @@
+From 663a6b5a4445a7ad2aca02b05d127d8890d8e033 Mon Sep 17 00:00:00 2001
+From: Ray Donnelly <mingw.android@gmail.com>
+Date: Thu, 27 Feb 2014 23:21:00 +0000
+Subject: [PATCH 5/5] Hardcode relative path to sh.exe as getSUCommand() for
+ _WIN32
+
+---
+ src/wmhelper.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/wmhelper.cpp b/src/wmhelper.cpp
+index 733c86d..fb1c2fe 100644
+--- a/src/wmhelper.cpp
++++ b/src/wmhelper.cpp
+@@ -269,6 +269,9 @@ QString WMHelper::getGKSUCommand(){
+ QString WMHelper::getSUCommand(){
+   QString result(ctn_NO_SU_COMMAND);
+ 
++#if defined(_WIN32)
++  return QCoreApplication::applicationDirPath()+QString("/../../bin/sh.exe -c ");
++#endif
+   if (isXFCERunning() && (UnixCommand::hasTheExecutable(ctn_GKSU_2))){
+     result = getGKSUCommand();
+   }
+-- 
+1.9.0
+
diff --git a/mingw-w64-octopi-git/PKGBUILD b/mingw-w64-octopi-git/PKGBUILD
index dfbb84290a..7e9b41f3a8 100644
--- a/mingw-w64-octopi-git/PKGBUILD
+++ b/mingw-w64-octopi-git/PKGBUILD
@@ -20,12 +20,14 @@ source=("${_gitname}::${_gitroot}"
         "0001-Hack-isRootRunning-to-always-be-false-for-_WIN32.patch"
         "0002-Define-QT_WA-as-unicode.patch"
         "0003-Use-Q_PID-for-m_pidTerminal.patch"
-        "0004-Hack-out-ProcessWrapper-onSingleShot-to-do-nothing-o.patch")
+        "0004-Hack-out-ProcessWrapper-onSingleShot-to-do-nothing-o.patch"
+        "0005-Hardcode-relative-path-to-sh.exe-as-getSUCommand-for.patch")
 md5sums=('SKIP'
-         '6311347f04dcacbc4f050261618e95e2'
-         'a5d962003a3e78ae05d15a08a190cada'
-         '7a35cb756824c6f4a47ff793d57f3598'
-         'b2f2116f39e1c9220a137c3cd1d90b08')
+         'b47603b49e9be3bbfa2478b6763c010f'
+         '5cd5815cdcb9765bc2769da4359101eb'
+         'e0a6dd9656b45ac2378ff2a74e5e57e2'
+         '58a1329d2a6f4ff15cf8001caebdc915'
+         '1b0215f9a1790ed833c8ada4550a95e3')
 
 pkgver() {
     cd "$srcdir/$_realname"
@@ -56,6 +58,7 @@ build() {
     git am "${srcdir}"/0002-Define-QT_WA-as-unicode.patch
     git am "${srcdir}"/0003-Use-Q_PID-for-m_pidTerminal.patch
     git am "${srcdir}"/0004-Hack-out-ProcessWrapper-onSingleShot-to-do-nothing-o.patch
+    git am "${srcdir}"/0005-Hardcode-relative-path-to-sh.exe-as-getSUCommand-for.patch
 
     echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
     #cmake .. -DCMAKE_INSTALL_PREFIX=$(kde4-config --prefix) -DCMAKE_BUILD_TYPE=Release