diff --git a/mingw-w64-python-binwalk/PKGBUILD b/mingw-w64-python-binwalk/PKGBUILD
index fb7ad0c1e9..068b8bb0ef 100644
--- a/mingw-w64-python-binwalk/PKGBUILD
+++ b/mingw-w64-python-binwalk/PKGBUILD
@@ -1,33 +1,41 @@
 # Maintainer: Martell Malone <martellmalone@gmail.com>
 
 _realname=binwalk
-pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") # "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") #"${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
 pkgver=2.0.1
-pkgrel=1
-pkgdesc="A tool for searching a given binary image for embedded files"
+pkgrel=2
+pkgdesc="A tool for searching a given binary image for embedded files (mingw-w64)"
 arch=('any')
 url="http://binwalk.org"
 license=('MIT')
-depends=('git' 'zlib' 'xz' 'gzip' 'bzip2' 'tar')
-source=(https://github.com/devttys0/${_realname}/archive/v${pkgver}.tar.gz)
+depends=("${MINGW_PACKAGE_PREFIX}-zlib"
+         "${MINGW_PACKAGE_PREFIX}-xz"
+         "${MINGW_PACKAGE_PREFIX}-systre"
+         "${MINGW_PACKAGE_PREFIX}-bzip2"
+         #'tar'
+         #'git'
+         )
+source=(${_realname}-${pkgver}.tar.gz::https://github.com/devttys0/${_realname}/archive/v${pkgver}.tar.gz)
 md5sums=('ffeea02b765e44ac7a2455398011fc73')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  echo $PYTHON
-  sed -i "s|\$(PYTHON) ./setup.py install \$(PREFIX)|\$(PYTHON) ./setup.py install \"--prefix=${pkgdir}/usr\"|" Makefile.in
+  local pyt=${MINGW_PREFIX}/bin/python3
+  sed -i "s|\$(PYTHON) ./setup.py install \$(PREFIX)|\$(PYTHON) ./setup.py install \"--prefix=${MINGW_PREFIX} --root=${pkgdir}\"|" Makefile.in
   autoconf
 }
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  ./configure --build=${CHOST} \
-    --prefix=/usr
+  ./configure \
+    --build=${MINGW_CHOST} \
+    --prefix=${MINGW_PREFIX}
+
   make
 }
 
 package() {
   cd "${srcdir}/${_realname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -m 644 -D "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${_realname}/LICENSE"
+  install -m 644 -D "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-h5py/001-mingw-python.patch b/mingw-w64-python-h5py/001-mingw-python.patch
new file mode 100644
index 0000000000..c12a8eb7ab
--- /dev/null
+++ b/mingw-w64-python-h5py/001-mingw-python.patch
@@ -0,0 +1,26 @@
+--- h5py-2.5.0/setup_build.py.orig	2015-07-21 19:33:54.858023400 +0300
++++ h5py-2.5.0/setup_build.py	2015-07-21 19:37:16.980584200 +0300
+@@ -17,6 +17,7 @@
+ from functools import reduce
+ import api_gen
+ 
++from sysconfig import _POSIX_BUILD
+ 
+ def localpath(*args):
+     return op.abspath(reduce(op.join, (op.dirname(__file__),)+args))
+@@ -36,7 +37,14 @@
+               localpath("lzf/lzf/lzf_d.c")]} 
+ 
+ 
+-if sys.platform.startswith('win'):
++if _POSIX_BUILD:
++    COMPILER_SETTINGS = {
++        'libraries'     : ['hdf5', 'hdf5_hl'],
++        'include_dirs'  : [localpath('lzf'), '/opt/local/include', '/usr/local/include'],
++        'library_dirs'  : ['/opt/local/lib', '/usr/local/lib'],
++        'define_macros' : [('H5_USE_16_API', None), ('_HDF5USEDLL_', None)] }
++        
++elif sys.platform.startswith('win'):
+     COMPILER_SETTINGS = {
+         'libraries'     : ['h5py_hdf5', 'h5py_hdf5_hl'],
+         'include_dirs'  : [localpath('lzf'), localpath('windows')],
diff --git a/mingw-w64-python-h5py/PKGBUILD b/mingw-w64-python-h5py/PKGBUILD
index 6ab453bfa7..a6c2cefb37 100644
--- a/mingw-w64-python-h5py/PKGBUILD
+++ b/mingw-w64-python-h5py/PKGBUILD
@@ -3,78 +3,75 @@
 _realname=h5py
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname"
          "${MINGW_PACKAGE_PREFIX}-python3-$_realname")
-pkgver=2.3.1
+pkgver=2.5.0
 pkgrel=1
-pkgdesc="General-purpose Python bindings for the HDF5 library. (mingw-w64)"
+pkgdesc="General-purpose Python bindings for the HDF5 library (mingw-w64)"
 arch=('any')
 url="http://www.h5py.org"
 license=('BSD')
-makedepends=(
-    "${MINGW_PACKAGE_PREFIX}-python2-numpy"
-    "${MINGW_PACKAGE_PREFIX}-python3-numpy"
-    "${MINGW_PACKAGE_PREFIX}-cython"
-    "${MINGW_PACKAGE_PREFIX}-cython2"
-    "${MINGW_PACKAGE_PREFIX}-gcc"
-    "${MINGW_PACKAGE_PREFIX}-hdf5"
-)
-source=(
-  https://pypi.python.org/packages/source/h/h5py/h5py-$pkgver.tar.gz
-  setup.py.patch
-  lzf_c.c.patch
-)
-md5sums=('8f32f96d653e904d20f9f910c6d9dd91'
-         '07604b410e29df82c06a9add19b755a5'
+makedepends=("${MINGW_PACKAGE_PREFIX}-python2-numpy"
+             "${MINGW_PACKAGE_PREFIX}-python3-numpy"
+             "${MINGW_PACKAGE_PREFIX}-python2-six"
+             "${MINGW_PACKAGE_PREFIX}-python3-six"
+             "${MINGW_PACKAGE_PREFIX}-cython"
+             "${MINGW_PACKAGE_PREFIX}-cython2"
+             "${MINGW_PACKAGE_PREFIX}-gcc"
+             "${MINGW_PACKAGE_PREFIX}-hdf5"
+             "${MINGW_PACKAGE_PREFIX}-pkg-config")
+source=(https://pypi.python.org/packages/source/h/h5py/h5py-${pkgver}.tar.gz
+        001-mingw-python.patch
+        lzf_c.c.patch)
+md5sums=('6e4301b5ad5da0d51b0a1e5ac19e3b74'
+         'cd36077bf04fb855b54c8bda5832dbd6'
          '8c28048812d378a8a9330dbd21def864')
 
 prepare() {
-  cd $_realname-$pkgver
-  patch -p1 -i ${srcdir}/setup.py.patch
+  cd ${_realname}-${pkgver}
+  patch -p1 -i ${srcdir}/001-mingw-python.patch
   patch -p1 -i ${srcdir}/lzf_c.c.patch
   cd ..
 
-  cp -a $_realname-$pkgver $_realname-py2-$pkgver
-  cp -a $_realname-$pkgver $_realname-py3-$pkgver
+  cp -a ${_realname}-${pkgver} ${_realname}-py2-${pkgver}
+  cp -a ${_realname}-${pkgver} ${_realname}-py3-${pkgver}
 }
 
 build() {
   # build for python2
-  cd ${srcdir}/$_realname-py2-$pkgver
+  cd ${srcdir}/${_realname}-py2-${pkgver}
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python2 setup.py build
 
   # build for python3
-  cd ${srcdir}/$_realname-py3-$pkgver
+  cd ${srcdir}/${_realname}-py3-${pkgver}
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py build
 }
 
 package_python2-h5py() {
-  depends=(
-    "${MINGW_PACKAGE_PREFIX}-python2-numpy"
-    "${MINGW_PACKAGE_PREFIX}-hdf5"
-  )
+  depends=("${MINGW_PACKAGE_PREFIX}-python2-numpy"
+           "${MINGW_PACKAGE_PREFIX}-python2-six"
+           "${MINGW_PACKAGE_PREFIX}-hdf5")
 
-  cd $_realname-py2-$pkgver
+  cd ${_realname}-py2-${pkgver}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python2 setup.py install --skip-build \
-  --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1
+    --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1
 
   install -Dm644 licenses/license.txt \
     "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE.txt"
 }
 
 package_python3-h5py() {
-  depends=(
-    "${MINGW_PACKAGE_PREFIX}-python3-numpy"
-    "${MINGW_PACKAGE_PREFIX}-hdf5"
-  )
+  depends=("${MINGW_PACKAGE_PREFIX}-python3-numpy"
+           "${MINGW_PACKAGE_PREFIX}-python3-six"
+           "${MINGW_PACKAGE_PREFIX}-hdf5")
 
-  cd $_realname-py3-$pkgver
+  cd ${_realname}-py3-${pkgver}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py install --skip-build \
-  --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1
+    --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1
 
   install -Dm644 licenses/license.txt \
     "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.txt"
diff --git a/mingw-w64-python-h5py/setup.py.patch b/mingw-w64-python-h5py/setup.py.patch
deleted file mode 100644
index c8a008e6ad..0000000000
--- a/mingw-w64-python-h5py/setup.py.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- h5py-py3-2.3.1/setup.py	2014-06-23 01:13:59.000000000 +0200
-+++ h5py-py2-2.3.1/setup.py	2014-09-25 21:35:00.415345000 +0200
-@@ -19,6 +19,7 @@
- 
- VERSION = '2.3.1'
- 
-+MSYS = "MSYSTEM" in os.environ
- 
- # --- Encapsulate NumPy imports in a specialized Extension type ---------------
- 
-@@ -131,7 +132,7 @@
- 
- # --- Configure Cython and create extensions ----------------------------------
- 
--if sys.platform.startswith('win'):
-+if sys.platform.startswith('win') and not MSYS:
-     COMPILER_SETTINGS = {
-         'libraries'     : ['h5py_hdf5','h5py_hdf5_hl'],
-         'include_dirs'  : [localpath('lzf'),
diff --git a/mingw-w64-tclvfs/PKGBUILD b/mingw-w64-tclvfs/PKGBUILD
index a5498c8a1d..c1984d06b8 100644
--- a/mingw-w64-tclvfs/PKGBUILD
+++ b/mingw-w64-tclvfs/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=tclvfs
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}-cvs
 pkgver=20130425
-pkgrel=1
+pkgrel=2
 pkgdesc="Virtual Filesystem support for Tcl"
 arch=('any')
 url="http://sourceforge.net/projects/tclvfs/"
@@ -17,16 +17,16 @@ md5sums=() #generate with 'makepkg -g'
 _cvsroot=":pserver:anonymous:@tclvfs.cvs.sourceforge.net:/cvsroot/tclvfs"
 _cvsmod="${_realname}"
 
-_build="$srcdir/$_cvsmod-build${CARCH}"
+_build="${srcdir}/$_cvsmod-build${CARCH}"
 
 prepare() {
-  cd "$srcdir"
+  cd "${srcdir}"
   msg "Connecting to $_cvsmod.sourceforge.net CVS server...."
   if [ -d $_cvsmod/CVS ]; then
     cd $_cvsmod
     cvs -z3 update -d
   else
-    cvs -z3 -d $_cvsroot co -D $pkgver -f $_cvsmod
+    cvs -z3 -d $_cvsroot co -D ${pkgver} -f $_cvsmod
   fi
 
   msg "CVS checkout done or server timeout"
@@ -35,10 +35,10 @@ prepare() {
 build() {
   msg "Starting build..."
 
-  rm -rf "$_build"
-  cp -r "$srcdir/$_cvsmod" "$_build"
+  rm -rf "${_build}"
+  cp -r "${srcdir}/${_cvsmod}" "$_build"
 
-  cd "$_build"
+  cd "${_build}"
   ./configure \
     --prefix=${MINGW_PREFIX} \
     --mandir=${MINGW_PREFIX}/share/man
@@ -46,6 +46,6 @@ build() {
 }
 
 package() {
-  cd "$_build"
-  make DESTDIR="$pkgdir" install
+  cd "${_build}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-tclx/PKGBUILD b/mingw-w64-tclx/PKGBUILD
index 4b813f1819..a9525f2751 100644
--- a/mingw-w64-tclx/PKGBUILD
+++ b/mingw-w64-tclx/PKGBUILD
@@ -4,14 +4,14 @@ _realname=tclx
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 _majorminor=8.4
 pkgver=${_majorminor}.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Extends Tcl by providing new operating system interface commands, extended file control and many other."
 arch=('any')
 url="http://tclx.sourceforge.net/"
 license=('BSD')
 depends=("${MINGW_PACKAGE_PREFIX}-tcl")
-source=("http://sourceforge.net/projects/tclx/files/TclX/$pkgver/${_realname}${pkgver}.tar.bz2"
-	'random.c')
+source=("http://sourceforge.net/projects/tclx/files/TclX/${pkgver}/${_realname}${pkgver}.tar.bz2"
+        'random.c')
 md5sums=('ac983708f23cf645c07058148f48440c'
          '59ad67a4a330de9062b594c37ea4d198')
 
@@ -25,18 +25,18 @@ build() {
   mkdir -p "${srcdir}/build-${CARCH}"
   cd "${srcdir}/build-${CARCH}"
 
-  [ "${MINGW_CHOST}" = 'x86_64-w64-mingw32' ] && enable64bit='--enable-64bit'
+  [[ "${MINGW_CHOST}" = 'x86_64-w64-mingw32' ]] && enable64bit='--enable-64bit'
 
   CFLAGS="-DUSE_INTERP_ERRORLINE $CFLAGS" \
-	"${srcdir}"/${_realname}${_majorminor}/configure \
-	--prefix=${MINGW_PREFIX} \
-	$enable64bit
+  ../${_realname}${_majorminor}/configure \
+    --prefix=${MINGW_PREFIX} \
+    $enable64bit
   make
 }
 
 package() {
   cd "${srcdir}/build-${CARCH}"
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="${pkgdir}" install
 
   local licdir=${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}
   mkdir -p ${licdir}
diff --git a/mingw-w64-tkimg/PKGBUILD b/mingw-w64-tkimg/PKGBUILD
index b66a53c55b..7873755d81 100644
--- a/mingw-w64-tkimg/PKGBUILD
+++ b/mingw-w64-tkimg/PKGBUILD
@@ -4,8 +4,8 @@ _pkgname=tkimg
 pkgname=${MINGW_PACKAGE_PREFIX}-$_pkgname
 _pkgver=1.4
 pkgver=${_pkgver}.2
-pkgrel=1
-pkgdesc="Adds support to Tk for many other Image formats: BMP, XBM, XPM, GIF, PNG, JPEG, TIFF and postscript."
+pkgrel=2
+pkgdesc="Adds support to Tk for many other Image formats: BMP, XBM, XPM, GIF, PNG, JPEG, TIFF and postscript (mingw-64)"
 url="http://tkimg.sourceforge.net"
 arch=('any')
 license=('BSD')
@@ -16,7 +16,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-tk")
 # Uses dtplite for generating the man pages:
 makedepends=("${MINGW_PACKAGE_PREFIX}-tcllib")
-source=("http://downloads.sourceforge.net/tkimg/$_pkgname$pkgver.tar.gz"
+source=("http://downloads.sourceforge.net/tkimg/${_pkgname}${pkgver}.tar.gz"
         001-compile-tif_jbig.patch
         002-dtplite_tcl.patch)
 md5sums=('c42b46692a55c402c97e8f2a896bc2d4'
@@ -46,6 +46,6 @@ build() {
 
 package() {
   cd "${srcdir}/build-${CARCH}"
-  make INSTALL_ROOT="$pkgdir" install
+  make INSTALL_ROOT="${pkgdir}" install
   rm -f ${pkgdir}/${MINGW_PREFIX}/lib/*.sh
 }
diff --git a/mingw-w64-tktable/PKGBUILD b/mingw-w64-tktable/PKGBUILD
index fae889fa6f..cdb719990a 100644
--- a/mingw-w64-tktable/PKGBUILD
+++ b/mingw-w64-tktable/PKGBUILD
@@ -6,22 +6,22 @@ _realname=tktable
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 _pkgnameactual=Tktable
 pkgver=2.10
-pkgrel=2
+pkgrel=3
 pkgdesc="A full-featured 2D table widget for Tk."
 arch=('any')
 url="http://tktable.sourceforge.net/"
 license=('custom')
 depends=("${MINGW_PACKAGE_PREFIX}-tk")
-source=("http://sourceforge.net/projects/tktable/files/${_realname}/$pkgver/${_pkgnameactual}${pkgver}.tar.gz")
+source=("http://sourceforge.net/projects/tktable/files/${_realname}/${pkgver}/${_pkgnameactual}${pkgver}.tar.gz")
 md5sums=('ecdd96b39ad49b820bf084eb1c786f66')
 
 build() {
   mkdir -p "${srcdir}/build-${CARCH}"
   cd "${srcdir}/build-${CARCH}"
 
-  [ "${MINGW_CHOST}" = 'x86_64-w64-mingw32' ] && enable64bit='--enable-64bit'
+  [[ "${MINGW_CHOST}" = 'x86_64-w64-mingw32' ]] && enable64bit='--enable-64bit'
 
-  "${srcdir}"/${_pkgnameactual}${pkgver}/configure \
+  ../${_pkgnameactual}${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     $enable64bit
   make
@@ -29,5 +29,5 @@ build() {
 
 package() {
   cd "${srcdir}/build-${CARCH}"
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-winsparkle-git/001-compile-fixes.patch b/mingw-w64-winsparkle-git/001-compile-fixes.patch
index 0d48130b06..3aa895407e 100644
--- a/mingw-w64-winsparkle-git/001-compile-fixes.patch
+++ b/mingw-w64-winsparkle-git/001-compile-fixes.patch
@@ -1,15 +1,3 @@
-diff -aur 000/src/download.cpp 001/src/download.cpp
---- 000/src/download.cpp	2015-04-12 07:10:48.357386800 -0300
-+++ 001/src/download.cpp	2015-04-12 07:11:26.623061500 -0300
-@@ -152,7 +152,7 @@
-                           NULL, // lpszHeaders
-                           -1,   // dwHeadersLength
-                           dwFlags,
--                          NULL  // dwContext
-+                          0     // dwContext
-                       );
-     if ( !conn )
-         throw Win32Exception();
 diff -aur 000/src/ui.cpp 001/src/ui.cpp
 --- 000/src/ui.cpp	2015-04-12 07:10:48.388636400 -0300
 +++ 001/src/ui.cpp	2015-04-12 07:12:39.286851600 -0300
@@ -21,15 +9,3 @@ diff -aur 000/src/ui.cpp 001/src/ui.cpp
      wxEntry(ms_hInstance);
  }
  
-diff -aur 000/src/utils.h 001/src/utils.h
---- 000/src/utils.h	2015-04-12 07:10:48.404261800 -0300
-+++ 001/src/utils.h	2015-04-12 07:11:26.638687500 -0300
-@@ -55,7 +55,7 @@
-     std::basic_string<TOut> out;
-     out.reserve(s.length());
- 
--    for ( std::basic_string<TIn>::const_iterator i = s.begin(); i != s.end(); ++i )
-+    for ( typename std::basic_string<TIn>::const_iterator i = s.begin(); i != s.end(); ++i )
-     {
-         out += static_cast<TOut>(*i);
-     }
diff --git a/mingw-w64-winsparkle-git/PKGBUILD b/mingw-w64-winsparkle-git/PKGBUILD
index 9745a360e9..bd205a5666 100644
--- a/mingw-w64-winsparkle-git/PKGBUILD
+++ b/mingw-w64-winsparkle-git/PKGBUILD
@@ -4,7 +4,7 @@ _realname='winsparkle'
 pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}-git)
 provides=(${MINGW_PACKAGE_PREFIX}-${_realname})
 conflicts=(${MINGW_PACKAGE_PREFIX}-${_realname})
-pkgver=r261.adc56a8
+pkgver=r286.61ae84e
 pkgrel=1
 url='http://winsparkle.org'
 pkgdesc='App update framework for Windows, inspired by Sparkle for OS X (mingw-w64)'
@@ -16,31 +16,31 @@ source=(${_realname}::'git+https://github.com/vslavik/winsparkle'
         001-compile-fixes.patch
         Makefile)
 sha1sums=('SKIP'
-          'e15bf4afc17cbf3a03d101fdf2b245ccb8cdeef1'
+          '7f60dc43089dc633eb2c0d0881b99b0cbd6249de'
           '8680f3d8f0e2aa9b8a57364c15e98d2f9d2c64c6')
 
 prepare() {
-    cd "${srcdir}/${_realname}"
-    patch -p1 < "${srcdir}"/001-compile-fixes.patch
+  cd "${srcdir}/${_realname}"
+  patch -p1 < "${srcdir}"/001-compile-fixes.patch
 }
 
 pkgver() {
-    cd "${srcdir}/${_realname}"
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "${srcdir}/${_realname}"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-    cd "${srcdir}/${_realname}/src"
-    cp ../../Makefile .
-    make
+  cd "${srcdir}/${_realname}/src"
+  cp ../../Makefile .
+  make
 }
 
 package() {
-    cd "${srcdir}/${_realname}"
-    install -D -m644 include/winsparkle.h         "${pkgdir}${MINGW_PREFIX}/include/winsparkle.h"
-    install -D -m644 include/winsparkle-version.h "${pkgdir}${MINGW_PREFIX}/include/winsparkle-version.h"
-    install -D -m644 src/libwinsparkle.a          "${pkgdir}${MINGW_PREFIX}/lib/libwinsparkle.a"
-    install -D -m644 src/libwinsparkle.dll.a      "${pkgdir}${MINGW_PREFIX}/lib/libwinsparkle.dll.a"
-    install -D -m755 src/libwinsparkle.dll        "${pkgdir}${MINGW_PREFIX}/bin/libwinsparkle.dll"
-    install -D -m644 COPYING                      "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
+  cd "${srcdir}/${_realname}"
+  install -D -m644 include/winsparkle.h         "${pkgdir}${MINGW_PREFIX}/include/winsparkle.h"
+  install -D -m644 include/winsparkle-version.h "${pkgdir}${MINGW_PREFIX}/include/winsparkle-version.h"
+  install -D -m644 src/libwinsparkle.a          "${pkgdir}${MINGW_PREFIX}/lib/libwinsparkle.a"
+  install -D -m644 src/libwinsparkle.dll.a      "${pkgdir}${MINGW_PREFIX}/lib/libwinsparkle.dll.a"
+  install -D -m755 src/libwinsparkle.dll        "${pkgdir}${MINGW_PREFIX}/bin/libwinsparkle.dll"
+  install -D -m644 COPYING                      "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }
diff --git a/mingw-w64-xmlstarlet/PKGBUILD b/mingw-w64-xmlstarlet/PKGBUILD
index fa404962b1..ea375c5ad0 100644
--- a/mingw-w64-xmlstarlet/PKGBUILD
+++ b/mingw-w64-xmlstarlet/PKGBUILD
@@ -13,21 +13,21 @@ conflicts=(${MINGW_PACKAGE_PREFIX}-${_name})
 md5sums=('SKIP')
 source=(${_name}::"git://xmlstar.git.sourceforge.net/gitroot/xmlstar/xmlstar")
 depends=(${MINGW_PACKAGE_PREFIX}-libxml2
-        ${MINGW_PACKAGE_PREFIX}-libxslt)
+         ${MINGW_PACKAGE_PREFIX}-libxslt)
 makedepends=(${MINGW_PACKAGE_PREFIX}-gcc ${MINGW_PACKAGE_PREFIX}-libiconv git)
 
 prepare() {
-  cd "$srcdir/${_name}"
+  cd "${srcdir}/${_name}"
   autoreconf -sif
 }
 
 pkgver() {
-  cd "$srcdir/${_name}"
+  cd "${srcdir}/${_name}"
   printf "r%s.%s" $(git rev-list --count HEAD) $(git rev-parse --short HEAD)
 }
 
 build() {
-  cd "$srcdir/${_name}"
+  cd "${srcdir}/${_name}"
   ./configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -42,10 +42,10 @@ build() {
 }
 
 package() {
-  cd "$srcdir/${_name}"
-  make DESTDIR="$pkgdir/" install
+  cd "${srcdir}/${_name}"
+  make DESTDIR="${pkgdir}" install
   local license_dir="${pkgdir}${MINGW_PREFIX}/share/licenses/${_name}"
   mkdir -p "$license_dir"
-  cp -v Copyright "$license_dir/Copyright"
+  cp -v Copyright "${license_dir}/Copyright"
   mv -v "${pkgdir}${MINGW_PREFIX}/bin/xml.exe" "${pkgdir}${MINGW_PREFIX}/bin/xmlstarlet.exe"
 }