diff --git a/mingw-w64-cython/PKGBUILD b/mingw-w64-cython/PKGBUILD
index b031e0deab..9c254087c2 100644
--- a/mingw-w64-cython/PKGBUILD
+++ b/mingw-w64-cython/PKGBUILD
@@ -10,10 +10,10 @@ groups=("${MINGW_PACKAGE_PREFIX}")
 url="http://www.cython.org"
 license=('APACHE')
 makedepends=(
-  "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-  "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
-  "${MINGW_PACKAGE_PREFIX}-gcc"
-)
+            "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+            "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
+            "${MINGW_PACKAGE_PREFIX}-gcc"
+            )
 source=("http://cython.org/release/Cython-$pkgver.tar.gz")
 md5sums=('6c9c4d19ba485fe8cd88e23b57ac7886')
 
@@ -22,7 +22,9 @@ prepare() {
 }
 
 package_cython() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+  depends=(
+        "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+  )
   cd $_realname-$pkgver
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
@@ -30,17 +32,28 @@ package_cython() {
 }
 
 package_cython2() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools")
+  depends=(
+        "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
+  )
   cd $_realname-py2-$pkgver
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
+  ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \
                                        --root="${pkgdir}" --optimize=1
   
-  sed -i 's|#!.*python3|#!/usr/bin/python2|' ${pkgdir}/${MINGW_PREFIX}/bin/*.py
+  sed -i 's|#!.*python3|#!/usr/bin/env python2|' ${pkgdir}/${MINGW_PREFIX}/bin/*.py
   
-  mv $pkgdir/${MINGW_PREFIX}/bin/cygdb.exe $pkgdir/${MINGW_PREFIX}/bin/cygdb2.exe
-  mv $pkgdir/${MINGW_PREFIX}/bin/cython.exe $pkgdir/${MINGW_PREFIX}/bin/cython2.exe
-  mv $pkgdir/${MINGW_PREFIX}/bin/cythonize.exe $pkgdir/${MINGW_PREFIX}/bin/cythonize2.exe
+  mv $pkgdir/${MINGW_PREFIX}/bin/cygdb{,2}.exe
+  mv $pkgdir/${MINGW_PREFIX}/bin/cython{,2}.exe
+  mv $pkgdir/${MINGW_PREFIX}/bin/cythonize{,2}.exe
+  if [ -f $pkgdir/${MINGW_PREFIX}/bin/cygdb.exe.manifest ]; then
+    mv $pkgdir/${MINGW_PREFIX}/bin/cygdb{,2}.exe.manifest
+    mv $pkgdir/${MINGW_PREFIX}/bin/cython{,2}.exe.manifest
+    mv $pkgdir/${MINGW_PREFIX}/bin/cythonize{,2}.exe.manifest
+  fi
+  
+  mv $pkgdir/${MINGW_PREFIX}/bin/cygdb{,2}-script.py
+  mv $pkgdir/${MINGW_PREFIX}/bin/cython{,2}-script.py
+  mv $pkgdir/${MINGW_PREFIX}/bin/cythonize{,2}-script.py
 }
 
 package_mingw-w64-i686-cython() {
diff --git a/mingw-w64-python-dateutil/PKGBUILD b/mingw-w64-python-dateutil/PKGBUILD
index 611d0b1f07..7b1e087265 100644
--- a/mingw-w64-python-dateutil/PKGBUILD
+++ b/mingw-w64-python-dateutil/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com >
 
-_pkgname=dateutil
-pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_pkgname" "${MINGW_PACKAGE_PREFIX}-python3-$_pkgname")
+_realname=dateutil
+pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname")
 pkgver=2.2
 pkgrel=2
 pkgdesc="Provides powerful extensions to the standard datetime module (mingw-w64)"
@@ -40,7 +40,7 @@ package_python3-dateutil() {
   ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
   --root=$pkgdir --optimize=1
   
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
   chmod -R a+r $pkgdir/${MINGW_PREFIX}/lib/python3.4/
 
   # Remove data files
@@ -56,7 +56,7 @@ package_python2-dateutil() {
   ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \
   --root=$pkgdir --optimize=1
   
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
   chmod -R a+r $pkgdir/${MINGW_PREFIX}/lib/python2.7/
 
   # Remove data files
diff --git a/mingw-w64-python-matplotlib/PKGBUILD b/mingw-w64-python-matplotlib/PKGBUILD
index 273ac1c0f3..9b70eba924 100644
--- a/mingw-w64-python-matplotlib/PKGBUILD
+++ b/mingw-w64-python-matplotlib/PKGBUILD
@@ -35,40 +35,40 @@ prepare() {
   sed -i 's/setupext\.BackendCairo/#setupext\.BackendCairo/g' setup.py
   
   cd ${srcdir}/$_realname-py2-$pkgver
-  sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+  sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/env python2|" \
     -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
     -i $(find . -name '*.py')
 }
 
 build() {
-   cd ${srcdir}/$_realname-py3-$pkgver
-   
-   # can not find freetype2 in a clean way
-   if [ -d /mingw64/include/freetype2 ]; then
-        cp -a /mingw64/include/freetype2/* extern/
-   fi
-   
-   if [ -d /mingw32/include/freetype2 ]; then
-        cp -a /mingw32/include/freetype2/* extern/
-   fi
-   
-   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-   ${MINGW_PREFIX}/bin/python3 setup.py build
-   
-   cd ${srcdir}/$_realname-py2-$pkgver
-   
-   # can not find freetype2 in a clean way
-   if [ -d /mingw64/include/freetype2 ]; then
-        cp -a /mingw64/include/freetype2/* extern/
-   fi
-   
-   if [ -d /mingw32/include/freetype2 ]; then
-        cp -a /mingw32/include/freetype2/* extern/
-   fi
-   
-   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-   ${MINGW_PREFIX}/bin/python2 setup.py build
+  cd ${srcdir}/$_realname-py3-$pkgver
+
+  # can not find freetype2 in a clean way
+  # if [ -d /mingw64/include/freetype2 ]; then
+      # cp -a /mingw64/include/freetype2/* extern/
+  # fi
+
+  # if [ -d /mingw32/include/freetype2 ]; then
+      # cp -a /mingw32/include/freetype2/* extern/
+  # fi
+
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python3 setup.py build
+
+  cd ${srcdir}/$_realname-py2-$pkgver
+
+  # can not find freetype2 in a clean way
+  # if [ -d /mingw64/include/freetype2 ]; then
+      # cp -a /mingw64/include/freetype2/* extern/
+  # fi
+
+  # if [ -d /mingw32/include/freetype2 ]; then
+      # cp -a /mingw32/include/freetype2/* extern/
+  # fi
+
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python2 setup.py build
 }
 
 package_python3-matplotlib() {
@@ -87,7 +87,7 @@ package_python3-matplotlib() {
    --root "${pkgdir}" --prefix=${MINGW_PREFIX}
 
    install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib
-   install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python-matplotlib
+   install -m 644 doc/users/license.rst "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-matplotlib
 }
 
 package_python2-matplotlib() {
@@ -106,7 +106,7 @@ package_python2-matplotlib() {
    --root "${pkgdir}" --prefix=${MINGW_PREFIX}
 
    install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib
-   install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python-matplotlib
+   install -m 644 doc/users/license.rst "${pkgdir}${MINGW_PREFIX}"/share/licenses/python2-matplotlib
 }
 
 package_mingw-w64-i686-python2-matplotlib() {
diff --git a/mingw-w64-python-numpy/PKGBUILD b/mingw-w64-python-numpy/PKGBUILD
index 450408dadb..6607742144 100644
--- a/mingw-w64-python-numpy/PKGBUILD
+++ b/mingw-w64-python-numpy/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=numpy
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=1.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Scientific tools for Python (mingw-w64)"
 arch=('any')
 license=('BSD')
diff --git a/mingw-w64-python-pyparsing/PKGBUILD b/mingw-w64-python-pyparsing/PKGBUILD
index 6ee24fc906..914c672628 100644
--- a/mingw-w64-python-pyparsing/PKGBUILD
+++ b/mingw-w64-python-pyparsing/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com >
 
-_pkgname=pyparsing
-pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_pkgname" "${MINGW_PACKAGE_PREFIX}-python3-$_pkgname")
+_realname=pyparsing
+pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname")
 pkgver=2.0.2
 pkgrel=1
 pkgdesc='General parsing module for Python (mingw-w64)'
@@ -27,9 +27,9 @@ package_python3-pyparsing() {
   cd $srcdir/python3-pyparsing-$pkgver
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
-  --root="$pkgdir" --optimize=1
+    --root="$pkgdir" --optimize=1
   
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
 }
  
 package_python2-pyparsing() {
@@ -38,9 +38,9 @@ package_python2-pyparsing() {
   cd $srcdir/python2-pyparsing-$pkgver
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \
-  --root="$pkgdir" --optimize=1
+    --root="$pkgdir" --optimize=1
   
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE"
 }
 
 package_mingw-w64-i686-python2-pyparsing() {
diff --git a/mingw-w64-python-pytz/PKGBUILD b/mingw-w64-python-pytz/PKGBUILD
index 65dd68e46a..8ffda8b04b 100644
--- a/mingw-w64-python-pytz/PKGBUILD
+++ b/mingw-w64-python-pytz/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com >
 
-_pkgname=pytz
-pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_pkgname" "${MINGW_PACKAGE_PREFIX}-python3-$_pkgname")
+_realname=pytz
+pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname")
 pkgver=2014.7
 pkgrel=1
 pkgdesc="Cross platform time zone library for Python (mingw-w64)"
@@ -39,7 +39,7 @@ package_python3-pytz() {
   ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
   --root=$pkgdir --optimize=1
   
-  install -D LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -D LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
 }
  
 package_python2-pytz() {
@@ -53,7 +53,7 @@ package_python2-pytz() {
   ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \
   --root=$pkgdir --optimize=1
   
-  install -D LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -D LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
 }
 
 package_mingw-w64-i686-python2-pytz() {
diff --git a/mingw-w64-python-six/PKGBUILD b/mingw-w64-python-six/PKGBUILD
index 5f51f7b539..bf18e40190 100644
--- a/mingw-w64-python-six/PKGBUILD
+++ b/mingw-w64-python-six/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com >
 
-_pkgname=six
-pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_pkgname" "${MINGW_PACKAGE_PREFIX}-python3-$_pkgname")
+_realname=six
+pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname")
 pkgver=1.8.0
 pkgrel=1
 pkgdesc="Python 2 and 3 compatibility utilities (mingw-w64)"
@@ -36,7 +36,7 @@ package_python3-six() {
   ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
   --root "${pkgdir}" --optimize=1
   
-  install -Dm644 "${srcdir}/six-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 "${srcdir}/six-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
 }
  
 package_python2-six() {
@@ -47,7 +47,7 @@ package_python2-six() {
   ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \
   --root "${pkgdir}" --optimize=1
   
-  install -Dm644 "${srcdir}/six-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 "${srcdir}/six-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE"
 }
 
 package_mingw-w64-i686-python2-six() {