diff --git a/mingw-w64-muparser/PKGBUILD b/mingw-w64-muparser/PKGBUILD
index 97f66c0084..4e112cfead 100644
--- a/mingw-w64-muparser/PKGBUILD
+++ b/mingw-w64-muparser/PKGBUILD
@@ -3,39 +3,44 @@
 _realname=muparser
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.2.4
+pkgver=2.2.5
 pkgrel=1
 pkgdesc="A fast math parser library (mingw-w64)"
 arch=('any')
-url="http://muparser.sourceforge.net/"
+url="http://muparser.beltoforion.de/"
 license=('custom')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake")
 options=('!makeflags')
-source=("${_realname}-${pkgver}.zip::https://drive.google.com/uc?export=download&id=0BzuB-ydOOoduejdwdTQwcF9JLTA" "CMakeLists.txt")
-sha1sums=('78db09680cafd5db4fd08a5d472afd2fa65f9274' '76f802239c1a5e0bff713db99ce60a9956a20257')
+source=("${_realname}-${pkgver}.tar.gz"::https://github.com/beltoforion/muparser/archive/v${pkgver}.tar.gz
+        "CMakeLists.txt")
+sha1sums=('d86946f8bc5f5d74063313a00c16798a418e308b'
+          '76f802239c1a5e0bff713db99ce60a9956a20257')
 
 prepare() {
-  cd $srcdir/${_realname}_v${pkgver//./_}
-  cp "$srcdir/CMakeLists.txt" .
+  cd ${srcdir}/${_realname}-${pkgver}
+  cp "${srcdir}/CMakeLists.txt" .
 }
 
 build() {
-  cd $srcdir/${_realname}_v${pkgver//./_}
+  rm -rf build-${MINGW_CHOST}
   mkdir -p build-${MINGW_CHOST}
   cd build-${MINGW_CHOST}
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-  ${MINGW_PREFIX}/bin/cmake.exe -G"MSYS Makefiles" \
+  ${MINGW_PREFIX}/bin/cmake.exe \
+    -G"MSYS Makefiles" \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} ..
+    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+    ../${_realname}-${pkgver}
+
   make
 }
 
 package() {
-  cd $srcdir/${_realname}_v${pkgver//./_}/build-${MINGW_CHOST}
+  cd build-${MINGW_CHOST}
   make DESTDIR=${pkgdir} install
 
   # license
-  install -D -m644 ../License.txt \
-  $pkgdir${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
+  install -D -m644 ${srcdir}/${_realname}-${pkgver}/License.txt \
+  ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
 }