diff --git a/mingw-w64-crt-git/PKGBUILD b/mingw-w64-crt-git/PKGBUILD
index 3a73c13079..d344d68037 100644
--- a/mingw-w64-crt-git/PKGBUILD
+++ b/mingw-w64-crt-git/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=crt
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 replaces="${MINGW_PACKAGE_PREFIX}-${_realname}-svn"
-pkgver=5.0.0.4492.85b4034
+pkgver=5.0.0.4497.4254261
 pkgrel=1
 pkgdesc='MinGW-w64 CRT for Windows'
 arch=('any')
@@ -17,7 +17,7 @@ makedepends=("git"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 options=('!strip' 'staticlibs' '!buildflags' '!emptydirs')
-source=("${_realname}"::"git://git.code.sf.net/p/mingw-w64/mingw-w64"
+source=("mingw-w64"::"git://git.code.sf.net/p/mingw-w64/mingw-w64"
         "0001-d3d11-Add-prototype-for-CreateDeviceAndSwapChain.patch"
         "0002-dxgi-Add-interface-for-IDXGISurface1.patch"
         "0003-dxgi-Add-missing-dxgi-1.2-structs-and-interfaces.patch"
@@ -31,7 +31,7 @@ md5sums=('SKIP'
          '652859ad478448a70c2074a854a313ec')
 
 pkgver() {
-  cd "$srcdir/${_realname}"
+  cd "$srcdir/mingw-w64"
   local _major=$(head -n 16 mingw-w64-headers/crt/_mingw_mac.h | grep '__MINGW64_VERSION_MAJOR' | sed -e 's/.* //' | tr '\n' '.' | sed 's/.$/\n/')
   local _minor=$(head -n 16 mingw-w64-headers/crt/_mingw_mac.h | grep '__MINGW64_VERSION_MINOR' | sed -e 's/.* //' | tr '\n' '.' | sed 's/.$/\n/')
   local _rev=0
@@ -39,7 +39,7 @@ pkgver() {
 }
 
 prepare() {
-  cd ${srcdir}/${_realname}
+  cd ${srcdir}/mingw-w64
   git am "${srcdir}/"0001-d3d11-Add-prototype-for-CreateDeviceAndSwapChain.patch
   git am "${srcdir}/"0002-dxgi-Add-interface-for-IDXGISurface1.patch
   git am "${srcdir}/"0003-dxgi-Add-missing-dxgi-1.2-structs-and-interfaces.patch
@@ -58,8 +58,9 @@ build() {
     ;;
   esac
 
+  [ -d ${srcdir}/crt-${MINGW_CHOST} ] && rm -rf ${srcdir}/crt-${MINGW_CHOST}
   mkdir -p ${srcdir}/crt-${MINGW_CHOST} && cd ${srcdir}/crt-${MINGW_CHOST}
-  ${srcdir}/${_realname}/mingw-w64-crt/configure \
+  ${srcdir}/mingw-w64/mingw-w64-crt/configure \
     --prefix=${MINGW_PREFIX}/${MINGW_CHOST} \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
diff --git a/mingw-w64-headers-git/PKGBUILD b/mingw-w64-headers-git/PKGBUILD
index d7b7933dea..85282e5bd8 100644
--- a/mingw-w64-headers-git/PKGBUILD
+++ b/mingw-w64-headers-git/PKGBUILD
@@ -4,7 +4,7 @@ _realname=headers
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 replaces="${MINGW_PACKAGE_PREFIX}-${_realname}-svn"
 pkgdesc="MinGW-w64 headers for Windows"
-pkgver=5.0.0.4492.85b4034
+pkgver=5.0.0.4497.4254261
 pkgrel=1
 arch=('any')
 url="http://mingw-w64.sourceforge.net"
@@ -14,7 +14,7 @@ makedepends=('git' "${MINGW_PACKAGE_PREFIX}-tools")
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 options=('!strip' '!libtool' '!emptydirs')
-source=("${_realname}"::"git://git.code.sf.net/p/mingw-w64/mingw-w64"
+source=("mingw-w64"::"git://git.code.sf.net/p/mingw-w64/mingw-w64"
         "0001-d3d11-Add-prototype-for-CreateDeviceAndSwapChain.patch"
         "0002-dxgi-Add-interface-for-IDXGISurface1.patch"
         "0003-dxgi-Add-missing-dxgi-1.2-structs-and-interfaces.patch"
@@ -28,7 +28,7 @@ md5sums=('SKIP'
          '652859ad478448a70c2074a854a313ec')
 
 pkgver() {
-  cd "$srcdir/$_realname"
+  cd "$srcdir/mingw-w64"
   local _major=$(head -n 16 mingw-w64-headers/crt/_mingw_mac.h | grep '__MINGW64_VERSION_MAJOR' | sed -e 's/.* //' | tr '\n' '.' | sed 's/.$/\n/')
   local _minor=$(head -n 16 mingw-w64-headers/crt/_mingw_mac.h | grep '__MINGW64_VERSION_MINOR' | sed -e 's/.* //' | tr '\n' '.' | sed 's/.$/\n/')
   local _rev=0
@@ -36,7 +36,7 @@ pkgver() {
 }
 
 prepare() {
-  cd ${srcdir}/${_realname}
+  cd ${srcdir}/mingw-w64
 
   git am "${srcdir}/"0001-d3d11-Add-prototype-for-CreateDeviceAndSwapChain.patch
   git am "${srcdir}/"0002-dxgi-Add-interface-for-IDXGISurface1.patch
@@ -44,14 +44,15 @@ prepare() {
   git am "${srcdir}/"0004-d3d11-Add-missing-d3d11-1.1-structs-and-interfaces.patch
   git am "${srcdir}/"0005-Add-missing-DirectX11-enum.patch
 
-  cd ${srcdir}/${_realname}/mingw-w64-headers
+  cd ${srcdir}/mingw-w64/mingw-w64-headers
   touch include/windows.*.h include/wincrypt.h include/prsht.h
 }
 
 build() {
   msg "Configuring ${MINGW_CHOST} headers"
+  [ -d ${srcdir}/headers-${MINGW_CHOST} ] && rm -rf ${srcdir}/headers-${MINGW_CHOST}
   mkdir -p ${srcdir}/headers-${MINGW_CHOST} && cd ${srcdir}/headers-${MINGW_CHOST}
-  ${srcdir}/${_realname}/mingw-w64-headers/configure \
+  ${srcdir}/mingw-w64/mingw-w64-headers/configure \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
     --target=${MINGW_CHOST} \
@@ -71,7 +72,7 @@ package() {
   rm ${pkgdir}${MINGW_PREFIX}/${MINGW_CHOST}/include/pthread_unistd.h
 
   msg "Installing MinGW-w64 licenses"
-  install -Dm644 ${srcdir}/${_realname}/mingw-w64-headers/ddk/readme.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/ddk-readme.txt
-  install -Dm644 ${srcdir}/${_realname}/mingw-w64-headers/direct-x/COPYING.LIB ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/direct-x-COPYING.LIB
-  install -Dm644 ${srcdir}/${_realname}/mingw-w64-headers/direct-x/readme.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/direct-x-readme.txt
+  install -Dm644 ${srcdir}/mingw-w64/mingw-w64-headers/ddk/readme.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/ddk-readme.txt
+  install -Dm644 ${srcdir}/mingw-w64/mingw-w64-headers/direct-x/COPYING.LIB ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/direct-x-COPYING.LIB
+  install -Dm644 ${srcdir}/mingw-w64/mingw-w64-headers/direct-x/readme.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/direct-x-readme.txt
 }
diff --git a/mingw-w64-libmangle-git/PKGBUILD b/mingw-w64-libmangle-git/PKGBUILD
index 66df630613..19be052b56 100644
--- a/mingw-w64-libmangle-git/PKGBUILD
+++ b/mingw-w64-libmangle-git/PKGBUILD
@@ -5,7 +5,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-svn")
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=5.0.0.4492.85b4034
+pkgver=5.0.0.4497.4254261
 pkgrel=1
 pkgdesc="MinGW-w64 libmangle"
 arch=('any')
@@ -18,11 +18,11 @@ makedepends=("git"
              "${MINGW_PACKAGE_PREFIX}-crt-git"
              "${MINGW_PACKAGE_PREFIX}-headers-git")
 options=('strip' 'staticlibs' '!emptydirs')
-source=("${_realname}"::"git://git.code.sf.net/p/mingw-w64/mingw-w64")
+source=("mingw-w64"::"git://git.code.sf.net/p/mingw-w64/mingw-w64")
 md5sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${_realname}"
+  cd "${srcdir}/mingw-w64"
   local _major=$(head -n 16 mingw-w64-headers/crt/_mingw_mac.h | grep '__MINGW64_VERSION_MAJOR' | sed -e 's/.* //' | tr '\n' '.' | sed 's/.$/\n/')
   local _minor=$(head -n 16 mingw-w64-headers/crt/_mingw_mac.h | grep '__MINGW64_VERSION_MINOR' | sed -e 's/.* //' | tr '\n' '.' | sed 's/.$/\n/')
   local _rev=0
@@ -30,17 +30,19 @@ pkgver() {
 }
 
 build() {
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}
-  cd ${srcdir}/build-${MINGW_CHOST}
-  ${srcdir}/${_realname}/mingw-w64-libraries/libmangle/configure \
+  [ -d ${srcdir}/build-${MINGW_CHOST} ] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+
+  ${srcdir}/mingw-w64/mingw-w64-libraries/libmangle/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST}
+
   make
 }
 
 package() {
   cd ${srcdir}/build-${MINGW_CHOST}
   make DESTDIR=${pkgdir} install
-  install -Dm644 ${srcdir}/${_realname}/mingw-w64-libraries/libmangle/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/mingw-w64-libraries/COPYING.${_realname}
+  install -Dm644 ${srcdir}/mingw-w64/mingw-w64-libraries/libmangle/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/mingw-w64-libraries/COPYING.${_realname}
 }
diff --git a/mingw-w64-tools-git/PKGBUILD b/mingw-w64-tools-git/PKGBUILD
index f3c9cb51da..3fe1203109 100644
--- a/mingw-w64-tools-git/PKGBUILD
+++ b/mingw-w64-tools-git/PKGBUILD
@@ -5,7 +5,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 replaces="${MINGW_PACKAGE_PREFIX}-${_realname}-svn"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=5.0.0.4492.85b4034
+pkgver=5.0.0.4497.4254261
 pkgrel=1
 pkgdesc="MinGW-w64 tools"
 arch=('any')
@@ -15,12 +15,12 @@ groups=("${MINGW_PACKAGE_PREFIX}-toolchain")
 makedepends=("git" "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-libmangle")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 options=('staticlibs' '!emptydirs')
-source=("${_realname}"::"git://git.code.sf.net/p/mingw-w64/mingw-w64")
+source=("mingw-w64"::"git://git.code.sf.net/p/mingw-w64/mingw-w64")
 md5sums=('SKIP')
 _tools="gendef genidl genpeimg widl" # genstubdll
 
 pkgver() {
-  cd "$srcdir/${_realname}"
+  cd "$srcdir/mingw-w64"
   local _major=$(head -n 16 mingw-w64-headers/crt/_mingw_mac.h | grep '__MINGW64_VERSION_MAJOR' | sed -e 's/.* //' | tr '\n' '.' | sed 's/.$/\n/')
   local _minor=$(head -n 16 mingw-w64-headers/crt/_mingw_mac.h | grep '__MINGW64_VERSION_MINOR' | sed -e 's/.* //' | tr '\n' '.' | sed 's/.$/\n/')
   local _rev=0
@@ -31,9 +31,10 @@ build() {
   local cur=
   for cur in ${_tools}; do
     plain "Building ${cur} ..."
+    [ -d ${srcdir}/${MINGW_CHOST}-${cur} ] && rm -rf ${srcdir}/${MINGW_CHOST}-${cur}
     mkdir -p ${srcdir}/${MINGW_CHOST}-${cur}
     cd ${srcdir}/${MINGW_CHOST}-${cur}
-    ${srcdir}/${_realname}/mingw-w64-tools/${cur}/configure \
+    ${srcdir}/mingw-w64/mingw-w64-tools/${cur}/configure \
       --prefix=${MINGW_PREFIX} \
       --build=${MINGW_CHOST} \
       --host=${MINGW_CHOST} \
@@ -48,8 +49,8 @@ package() {
     plain "Installing ${cur} ..."
     cd ${srcdir}/${MINGW_CHOST}-${cur}
     make DESTDIR=${pkgdir} install
-    if [[ -f "${srcdir}/${_realname}/mingw-w64-tools//${cur}"/COPYING ]]; then
-      install -Dm644 ${srcdir}/${_realname}/mingw-w64-tools/${cur}/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/mingw-w64-tools/COPYING.${cur}
+    if [[ -f "${srcdir}/mingw-w64/mingw-w64-tools/${cur}"/COPYING ]]; then
+      install -Dm644 ${srcdir}/mingw-w64/mingw-w64-tools/${cur}/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/mingw-w64-tools/COPYING.${cur}
     fi
   done
 }
diff --git a/mingw-w64-winpthreads-git/PKGBUILD b/mingw-w64-winpthreads-git/PKGBUILD
index 91a0ec681b..dfd7fa5e70 100644
--- a/mingw-w64-winpthreads-git/PKGBUILD
+++ b/mingw-w64-winpthreads-git/PKGBUILD
@@ -4,7 +4,7 @@
 
 _realname=winpthreads
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git" "${MINGW_PACKAGE_PREFIX}-libwinpthread-git")
-pkgver=5.0.0.4492.85b4034
+pkgver=5.0.0.4497.4254261
 pkgrel=1
 pkgdesc="MinGW-w64 winpthreads library"
 arch=('any')
@@ -17,13 +17,13 @@ makedepends=("git"
              "${MINGW_PACKAGE_PREFIX}-crt-git"
              "${MINGW_PACKAGE_PREFIX}-headers-git")
 options=('strip' '!buildflags' 'staticlibs' '!emptydirs' '!debug')
-source=("${_realname}"::"git://git.code.sf.net/p/mingw-w64/mingw-w64"
+source=("mingw-w64"::"git://git.code.sf.net/p/mingw-w64/mingw-w64"
         "0001-Define-__-de-register_frame_info-in-fake-libgcc_s.patch")
 md5sums=('SKIP'
          '74a4dab06a8fa113407a6e11fdb3c962')
 
 pkgver() {
-  cd "${srcdir}/${_realname}"
+  cd "${srcdir}/mingw-w64"
   local _major=$(head -n 16 mingw-w64-headers/crt/_mingw_mac.h | grep '__MINGW64_VERSION_MAJOR' | sed -e 's/.* //' | tr '\n' '.' | sed 's/.$/\n/')
   local _minor=$(head -n 16 mingw-w64-headers/crt/_mingw_mac.h | grep '__MINGW64_VERSION_MINOR' | sed -e 's/.* //' | tr '\n' '.' | sed 's/.$/\n/')
   local _rev=0
@@ -31,16 +31,16 @@ pkgver() {
 }
 
 prepare() {
-  cd "${srcdir}/${_realname}"
+  cd "${srcdir}/mingw-w64"
   git am "${srcdir}"/0001-Define-__-de-register_frame_info-in-fake-libgcc_s.patch
-  cd "${srcdir}"/${_realname}/mingw-w64-libraries/winpthreads
+  cd "${srcdir}"/mingw-w64/mingw-w64-libraries/winpthreads
   autoreconf -vfi
 }
 
 build() {
+  [ -d ${srcdir}/build-${MINGW_CHOST} ] && rm -rf ${srcdir}/build-${MINGW_CHOST}
   mkdir -p "${srcdir}"/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
 
-
   declare -a extra_config
   if check_option "debug" "y"; then
     extra_config+=("CFLAGS=-O0 -g -DWINPTHREAD_DBG")
@@ -48,7 +48,7 @@ build() {
     extra_config+=("CXXFLAGS=")
   fi
 
-  "${srcdir}"/${_realname}/mingw-w64-libraries/winpthreads/configure \
+  "${srcdir}"/mingw-w64/mingw-w64-libraries/winpthreads/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
@@ -71,8 +71,8 @@ build() {
 
 _install_licenses() {
   # TODO: any more license files?
-  install -Dm644 ${srcdir}/${_realname}/COPYING                                 ${pkgdir}${MINGW_PREFIX}/share/licenses/$1/COPYING
-  install -Dm644 ${srcdir}/${_realname}/mingw-w64-libraries/winpthreads/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/$1/mingw-w64-libraries/winpthreads/COPYING
+  install -Dm644 ${srcdir}/mingw-w64/COPYING                                 ${pkgdir}${MINGW_PREFIX}/share/licenses/$1/COPYING
+  install -Dm644 ${srcdir}/mingw-w64/mingw-w64-libraries/winpthreads/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/$1/mingw-w64-libraries/winpthreads/COPYING
 }
 
 package_winpthreads() {
diff --git a/mingw-w64-winstorecompat-git/PKGBUILD b/mingw-w64-winstorecompat-git/PKGBUILD
index d046b2e270..4637179865 100644
--- a/mingw-w64-winstorecompat-git/PKGBUILD
+++ b/mingw-w64-winstorecompat-git/PKGBUILD
@@ -2,33 +2,35 @@
 
 _realname=winstorecompat
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
-_ver_base=4.0.0
-pkgver=4.0.0.4322.eba7897
+pkgver=5.0.0.4497.4254261
 pkgrel=1
 pkgdesc="MinGW-w64 winRT compat library"
 arch=('any')
 url="http://mingw-w64.sourceforge.net"
 license=('custom')
-groups=("${MINGW_PACKAGE_PREFIX}-toolchain" "${MINGW_PACKAGE_PREFIX}")
+groups=("${MINGW_PACKAGE_PREFIX}-toolchain")
 makedepends=("git" "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-binutils" "${MINGW_PACKAGE_PREFIX}-crt" "${MINGW_PACKAGE_PREFIX}-headers")
 options=('strip' '!buildflags' 'staticlibs' '!emptydirs' '!debug')
-source=("${_realname}"::"git://git.code.sf.net/p/mingw-w64/mingw-w64")
+source=("mingw-w64"::"git://git.code.sf.net/p/mingw-w64/mingw-w64")
 md5sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${_realname}"
-  printf "%s.%s.%s" "$_ver_base" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "${srcdir}/mingw-w64"
+  local _major=$(head -n 16 mingw-w64-headers/crt/_mingw_mac.h | grep '__MINGW64_VERSION_MAJOR' | sed -e 's/.* //' | tr '\n' '.' | sed 's/.$/\n/')
+  local _minor=$(head -n 16 mingw-w64-headers/crt/_mingw_mac.h | grep '__MINGW64_VERSION_MINOR' | sed -e 's/.* //' | tr '\n' '.' | sed 's/.$/\n/')
+  local _rev=0
+  printf "%s.%s.%s.%s.%s" ${_major} ${_minor} ${_rev} "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-  cd "${srcdir}/${_realname}"
+  cd "${srcdir}/mingw-w64"
 }
 
 build() {
+  [ -d ${srcdir}/build-${MINGW_CHOST} ] && rm -rf ${srcdir}/build-${MINGW_CHOST}
   mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
 
-
-  ${srcdir}/${_realname}/mingw-w64-libraries/winstorecompat/configure \
+  ${srcdir}/mingw-w64/mingw-w64-libraries/winstorecompat/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \