diff --git a/git-extra/PKGBUILD b/git-extra/PKGBUILD
index 99a512ee08..fbd15051a8 100644
--- a/git-extra/PKGBUILD
+++ b/git-extra/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase="mingw-w64-${_realname}"
 pkgname=($_realname
         "${MINGW_PACKAGE_PREFIX}-${_realname}")
 _ver_base=1.1
-pkgver=1.1.667.036188a82
+pkgver=1.1.670.09847e01e
 pkgrel=1
 pkgdesc="Git for Windows extra files"
 arch=('any')
@@ -82,7 +82,7 @@ sha256sums=('8ed76d1cb069ac8568f21c431f5e23caebea502d932ab4cdff71396f4f0d5b72'
             '683ab066be19cb4defec470ebd53f165ca5dbf761fd40c13aee8abe31ba42803'
             '1cf2c13fb97c51375a76ed479362c3cbcdb51ab4d3a745e8d2c3a780badd8d46'
             '32223da4e1264d0c9663dd3d4b347131a634e96c2676d673ca58b2a6c58d2aea'
-            '1f83355ec7be0f11239b68d3b9d4d04534b347212a9eac4335397875a13514ef'
+            '7436438b8db90ce4b79402a5383a688fa95831167b38f9f918f438ade199a44d'
             '22f41610dea842890955032af30efdb60e80f310e95a04e57ab36b10e0376923'
             '38c0cf57e03d275cdd42984f102bee8352fac672f875ab23c46b9625eefc49f3'
             '15b40ab72dea884f659cfbe441e9a40b2d8d63e490a3c14824a55607368e476d'
diff --git a/git-extra/git-sdk.sh b/git-extra/git-sdk.sh
index 9eba43a58d..a439ea7c7d 100755
--- a/git-extra/git-sdk.sh
+++ b/git-extra/git-sdk.sh
@@ -360,7 +360,7 @@ sdk () {
 				  git diff-index --quiet HEAD ||
 				  test ! -s .git/index ||
 				  (uname_m="$(uname -m)" &&
-				    test ! -d "../build-$uname_m-pc-msys/$uname_m-pc-cygwin/winsup/cygwin" &&
+				    test ! -d "../build-$uname_m-pc-cygwin/$uname_m-pc-cygwin/winsup/cygwin" &&
 				    test ! -d "../build-$uname_m-pc-msys/$uname_m-pc-msys/winsup/cygwin"); }
 			then
 				# no local changes
@@ -371,9 +371,9 @@ sdk () {
 
 			# Build the current branch
 			(uname_m="$(uname -m)" &&
-			 if test -d "../build-$uname_m-pc-msys/$uname_m-pc-cygwin/winsup/cygwin"
+			 if test -d "../build-$uname_m-pc-cygwin/$uname_m-pc-cygwin/winsup/cygwin"
 			 then
-				cd "../build-$uname_m-pc-msys/$uname_m-pc-cygwin/winsup/cygwin"
+				cd "../build-$uname_m-pc-cygwin/$uname_m-pc-cygwin/winsup/cygwin"
 			 else
 				cd "../build-$uname_m-pc-msys/$uname_m-pc-msys/winsup/cygwin"
 			 fi &&