diff --git a/mingw-w64-python-matplotlib/PKGBUILD b/mingw-w64-python-matplotlib/PKGBUILD
index 6674398397..bf9a40c7bb 100644
--- a/mingw-w64-python-matplotlib/PKGBUILD
+++ b/mingw-w64-python-matplotlib/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com >
 
-_pkgname=matplotlib
-pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_pkgname" "${MINGW_PACKAGE_PREFIX}-python3-$_pkgname")
+_realname=matplotlib
+pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname")
 pkgver=1.4.0
 pkgrel=2
 pkgdesc="A python plotting library, making publication quality plots (mingw-w64)"
@@ -22,19 +22,19 @@ makedepends=(
             "${MINGW_PACKAGE_PREFIX}-python2-pyparsing"
             "${MINGW_PACKAGE_PREFIX}-python3-pyparsing"
 )
-source=("matplotlib-1.4.0.tar.gz") # "https://github.com/matplotlib/matplotlib/archive/v$pkgver.tar.gz")
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/matplotlib/matplotlib/archive/v$pkgver.tar.gz")
 md5sums=('fe5e319b85df48cbfe2e8f3d1a9c60f0')
 
 prepare() {  
-  cp -a $_pkgname-$pkgver $_pkgname-py2-$pkgver
-  cp -a $_pkgname-$pkgver $_pkgname-py3-$pkgver
+  cp -a $_realname-$pkgver $_realname-py2-$pkgver
+  cp -a $_realname-$pkgver $_realname-py3-$pkgver
   
-  cd ${srcdir}/$_pkgname-py3-$pkgver
+  cd ${srcdir}/$_realname-py3-$pkgver
   # remove cairo which fails for python3
   sed -i 's/setupext\.BackendGtk3Cairo/#setupext\.BackendGtk3Cairo/g' setup.py
   sed -i 's/setupext\.BackendCairo/#setupext\.BackendCairo/g' setup.py
   
-  cd ${srcdir}/$_pkgname-py2-$pkgver
+  cd ${srcdir}/$_realname-py2-$pkgver
   sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
     -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
@@ -42,7 +42,7 @@ prepare() {
 }
 
 build() {
-   cd ${srcdir}/$_pkgname-py3-$pkgver
+   cd ${srcdir}/$_realname-py3-$pkgver
    
    # can not find freetype2 in a clean way
    if [ -d /mingw64/include/freetype2 ]; then
@@ -56,7 +56,7 @@ build() {
    MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
    ${MINGW_PREFIX}/bin/python3 setup.py build
    
-   cd ${srcdir}/$_pkgname-py2-$pkgver
+   cd ${srcdir}/$_realname-py2-$pkgver
    
    # can not find freetype2 in a clean way
    if [ -d /mingw64/include/freetype2 ]; then
@@ -80,7 +80,7 @@ package_python3-matplotlib() {
         "${MINGW_PACKAGE_PREFIX}-python3-dateutil"
         "${MINGW_PACKAGE_PREFIX}-python3-pyparsing"
     )
-   cd ${srcdir}/$_pkgname-py3-$pkgver
+   cd ${srcdir}/$_realname-py3-$pkgver
    
    MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
    ${MINGW_PREFIX}/bin/python3 setup.py install -O1 --skip-build \
@@ -99,7 +99,7 @@ package_python2-matplotlib() {
         "${MINGW_PACKAGE_PREFIX}-python2-dateutil"
         "${MINGW_PACKAGE_PREFIX}-python2-pyparsing"
     )
-   cd ${srcdir}/$_pkgname-py2-$pkgver
+   cd ${srcdir}/$_realname-py2-$pkgver
    
    MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
    ${MINGW_PREFIX}/bin/python2 setup.py install -O1 --skip-build \