diff --git a/bento4/default/PKGBUILD b/bento4/default/PKGBUILD
index b1884fcb..b8198220 100644
--- a/bento4/default/PKGBUILD
+++ b/bento4/default/PKGBUILD
@@ -12,28 +12,28 @@ source=("http://zebulon.bok.net/Bento4/source/Bento4-SRC-$_pkgverstr.zip")
 md5sums=('2803b1c0a55c37a723ded7ff44dbfedc')
 _config="Release"
 if [ $CARCH == "i686" ]; then
-    _arch="x86"
+  _arch="x86"
 else
-    _arch=$CARCH
+  _arch=$CARCH
 fi
 
 build() {
-    cd "Build/Targets/$_arch-unknown-linux/"
-    sed -i "6s/.*/AP4_BUILD_CONFIG = $_config/" ../../Makefiles/Bootstrap.mak
-    make sdk
+  cd "Build/Targets/$_arch-unknown-linux/"
+  sed -i "6s/.*/AP4_BUILD_CONFIG = $_config/" ../../Makefiles/Bootstrap.mak
+  make sdk
 }
 
 package() {
-    cd "Build/Targets/$_arch-unknown-linux/$_config/SDK"
-    mkdir -p $pkgdir/usr/bin/
-    mkdir -p $pkgdir/usr/lib/
-    mkdir -p $pkgdir/usr/include/$pkgname/
-    pushd ./bin
-    for file in *; do
-        # prefix binaries with "bento4-" to avoid conflicts
-        install -m755 -D "./$file" "$pkgdir/usr/bin/bento4-$file"
-    done
-    popd
-    install -m644 -D ./lib/*.a $pkgdir/usr/lib/
-    install -m644 -D ./include/*.h $pkgdir/usr/include/$pkgname/
+  cd "Build/Targets/$_arch-unknown-linux/$_config/SDK"
+  mkdir -p $pkgdir/usr/bin/
+  mkdir -p $pkgdir/usr/lib/
+  mkdir -p $pkgdir/usr/include/$pkgname/
+  pushd ./bin
+  for file in *; do
+    # prefix binaries with "bento4-" to avoid conflicts
+    install -m755 -D "./$file" "$pkgdir/usr/bin/bento4-$file"
+  done
+  popd
+  install -m644 -D ./lib/*.a $pkgdir/usr/lib/
+  install -m644 -D ./include/*.h $pkgdir/usr/include/$pkgname/
 } 
diff --git a/blackwidowcontrol/default/PKGBUILD b/blackwidowcontrol/default/PKGBUILD
index b4d642a4..d176ae2e 100644
--- a/blackwidowcontrol/default/PKGBUILD
+++ b/blackwidowcontrol/default/PKGBUILD
@@ -18,7 +18,7 @@ noextract=
 sha256sums=('b840f36debfdf7ce745105b2d187d643ac7588589aa7caf2a475af7da72ef362')
 
 package() {
-    _srcdir="${srcdir}/${PROJECT_DIR_NAME:-$pkgname-$pkgver}"
-    install -Dm755 "${_srcdir}/blackwidowcontrol.py" "${pkgdir}/usr/bin/blackwidowcontrol"
-    install -Dm644 "${_srcdir}/razer_blackwidow.rules" "${pkgdir}/etc/udev/rules.d/70-razer_blackwidow.rules"
+  _srcdir="${srcdir}/${PROJECT_DIR_NAME:-$pkgname-$pkgver}"
+  install -Dm755 "${_srcdir}/blackwidowcontrol.py" "${pkgdir}/usr/bin/blackwidowcontrol"
+  install -Dm644 "${_srcdir}/razer_blackwidow.rules" "${pkgdir}/etc/udev/rules.d/70-razer_blackwidow.rules"
 }
diff --git a/brother-mfc-j4410dw/default/PKGBUILD b/brother-mfc-j4410dw/default/PKGBUILD
index ec45af0b..b2d46c84 100644
--- a/brother-mfc-j4410dw/default/PKGBUILD
+++ b/brother-mfc-j4410dw/default/PKGBUILD
@@ -19,43 +19,43 @@ md5sums=('ff42d0cf694f25e97dfe7a296a557d42'
          '5e87a3dc0f3e3438c088eda0f3565f0d')
 
 prepare() {
-    # do not install in '/usr/local'
-    if [ -d $srcdir/usr/local/Brother ]; then
-        install -d $srcdir/usr/share
-        mv $srcdir/usr/local/Brother/ $srcdir/usr/share/brother
-        rm -rf $srcdir/usr/local
-            sed -i 's|/usr/local/Brother|/usr/share/brother|g' `grep -lr '/usr/local/Brother' ./`
-        fi
-
-    # setup cups-directories
-    install -d $srcdir/usr/share/cups/model
-    install -d $srcdir/usr/lib/cups/filter
-
-    # go to the cupswrapper directory and find the source file from wich to generate a ppd- and wrapper-file
-    cd `find . -type d -name 'cupswrapper'`
-    if [ -f cupswrapper* ]; then
-        _wrapper_source=`ls cupswrapper*`
-        sed -i '/^\/etc\/init.d\/cups/d' $_wrapper_source
-        sed -i '/^sleep/d' $_wrapper_source
-        sed -i '/^lpadmin/d' $_wrapper_source
-        sed -i 's|/usr|$srcdir/usr|g' $_wrapper_source
-        sed -i 's|/opt|$srcdir/opt|g' $_wrapper_source
-        sed -i 's|/model/Brother|/model|g' $_wrapper_source
-        sed -i 's|lpinfo|echo|g' $_wrapper_source
-        export srcdir=$srcdir
-        ./$_wrapper_source
-        sed -i 's|$srcdir||' $srcdir/usr/lib/cups/filter/*lpdwrapper*
-        sed -i "s|$srcdir||" $srcdir/usr/lib/cups/filter/*lpdwrapper*
-        rm $_wrapper_source
+  # do not install in '/usr/local'
+  if [ -d $srcdir/usr/local/Brother ]; then
+    install -d $srcdir/usr/share
+    mv $srcdir/usr/local/Brother/ $srcdir/usr/share/brother
+    rm -rf $srcdir/usr/local
+      sed -i 's|/usr/local/Brother|/usr/share/brother|g' `grep -lr '/usr/local/Brother' ./`
     fi
 
-    # /etc/printcap is managed by cups
-    rm `find $srcdir -type f -name 'setupPrintcap*'`
+  # setup cups-directories
+  install -d $srcdir/usr/share/cups/model
+  install -d $srcdir/usr/lib/cups/filter
+
+  # go to the cupswrapper directory and find the source file from wich to generate a ppd- and wrapper-file
+  cd `find . -type d -name 'cupswrapper'`
+  if [ -f cupswrapper* ]; then
+    _wrapper_source=`ls cupswrapper*`
+    sed -i '/^\/etc\/init.d\/cups/d' $_wrapper_source
+    sed -i '/^sleep/d' $_wrapper_source
+    sed -i '/^lpadmin/d' $_wrapper_source
+    sed -i 's|/usr|$srcdir/usr|g' $_wrapper_source
+    sed -i 's|/opt|$srcdir/opt|g' $_wrapper_source
+    sed -i 's|/model/Brother|/model|g' $_wrapper_source
+    sed -i 's|lpinfo|echo|g' $_wrapper_source
+    export srcdir=$srcdir
+    ./$_wrapper_source
+    sed -i 's|$srcdir||' $srcdir/usr/lib/cups/filter/*lpdwrapper*
+    sed -i "s|$srcdir||" $srcdir/usr/lib/cups/filter/*lpdwrapper*
+    rm $_wrapper_source
+  fi
+
+  # /etc/printcap is managed by cups
+  rm `find $srcdir -type f -name 'setupPrintcap*'`
 }
 
 package() {
-    cp -R $srcdir/usr $pkgdir
-    if [ -d $srcdir/opt ]; then cp -R $srcdir/opt $pkgdir; fi
-    install -m 644 -D cupswrapper-license.txt $pkgdir/usr/share/licenses/${pkgname}/cupswrapper-licence.txt
-    install -m 644 -D lpr-license.txt $pkgdir/usr/share/licenses/${pkgname}/lpr-licence.txt
+  cp -R $srcdir/usr $pkgdir
+  if [ -d $srcdir/opt ]; then cp -R $srcdir/opt $pkgdir; fi
+  install -m 644 -D cupswrapper-license.txt $pkgdir/usr/share/licenses/${pkgname}/cupswrapper-licence.txt
+  install -m 644 -D lpr-license.txt $pkgdir/usr/share/licenses/${pkgname}/lpr-licence.txt
 }
diff --git a/brother-mfc-j4410dw/default/brother-mfc-j4410dw.install b/brother-mfc-j4410dw/default/brother-mfc-j4410dw.install
index d85d1453..39e68edb 100644
--- a/brother-mfc-j4410dw/default/brother-mfc-j4410dw.install
+++ b/brother-mfc-j4410dw/default/brother-mfc-j4410dw.install
@@ -1,9 +1,9 @@
 post_install() {
-    post_upgrade;
+  post_upgrade;
 }
 
 post_upgrade() {
-    echo "Restart CUPS to load the new files"
-    echo "You can now register your new printer using the web interface at:"
-    echo "  http://localhost:631/"
+  echo "Restart CUPS to load the new files"
+  echo "You can now register your new printer using the web interface at:"
+  echo "  http://localhost:631/"
 }
diff --git a/c++utilities/default/PKGBUILD b/c++utilities/default/PKGBUILD
index 8d58a64a..800b94fa 100644
--- a/c++utilities/default/PKGBUILD
+++ b/c++utilities/default/PKGBUILD
@@ -1,25 +1,24 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _reponame=cpp-utilities
 pkgname=c++utilities
-pkgver=3.0.0
+pkgver=3.1.0
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="Common C++ classes and routines used by my applications such
-as argument parser, IO and conversion utilities."
+pkgdesc="Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities."
 license=('GPL')
 depends=('gcc-libs')
-makedepends=('qt5-base')
+makedepends=('cmake')
 url="https://github.com/Martchus/${_reponame}"
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('6de9cb9d9d2af191be79652590d5a23dfaa886c5384c59e7227508542d764dff')
+sha256sums=('6a97975bd5614493cec700b9d5733a4dd78cbc361e05848b302f79ac6142915d')
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro"
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  make
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
diff --git a/c++utilities/git/PKGBUILD b/c++utilities/git/PKGBUILD
index 30dbb0e1..c61509c2 100644
--- a/c++utilities/git/PKGBUILD
+++ b/c++utilities/git/PKGBUILD
@@ -3,13 +3,12 @@ _name=c++utilities
 _reponame=cpp-utilities
 pkgname=c++utilities-git
 pkgver=50.4d6bf67
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
-pkgdesc="Common C++ classes and routines used by my applications such
-as argument parser, IO and conversion utilities (git version)."
+pkgdesc="Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities (git version)."
 license=('GPL')
 depends=('gcc-libs')
-makedepends=('qt5-base' 'git')
+makedepends=('cmake' 'git')
 provides=('c++utilities')
 conflicts=('c++utilities')
 url="https://github.com/Martchus/${_reponame}"
@@ -17,17 +16,17 @@ source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}/${pkgname}"
-    echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  cd "${srcdir}/${pkgname}"
+  echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 build() {
-    cd "${srcdir}/${pkgname}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$_name.pro"
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
diff --git a/c++utilities/mingw-w64/PKGBUILD b/c++utilities/mingw-w64/PKGBUILD
index 5ec5f5a6..3cffeb22 100644
--- a/c++utilities/mingw-w64/PKGBUILD
+++ b/c++utilities/mingw-w64/PKGBUILD
@@ -2,36 +2,35 @@
 _name=c++utilities
 _reponame=cpp-utilities
 pkgname=mingw-w64-c++utilities
-pkgver=3.0.0
+pkgver=3.1.0
 pkgrel=1
 arch=('any')
-pkgdesc="Common C++ classes and routines used by my applications such
-as argument parser, IO and conversion utilities (mingw-w64)."
+pkgdesc="Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities (mingw-w64)."
 license=('GPL')
 depends=('mingw-w64-crt')
-makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-base')
+makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
 url="https://github.com/Martchus/${_reponame}"
 source=("c++utilities-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('41dfde4b9e86c787cc93495508d017bdf490d6e93793c756e284d52ef340207d')
-options=('staticlibs' '!strip')
+sha256sums=('6a97975bd5614493cec700b9d5733a4dd78cbc361e05848b302f79ac6142915d')
+options=(!buildflags staticlibs !strip !emptydirs)
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    # build for each architecture
-    for _arch in ${_architectures}; do
-        mkdir -p build-${_arch} && pushd build-${_arch}
-        INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-dll CONFIG+=mingw-w64-noversion
-        make
-        popd
-    done
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  # build utilities for each architecture
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/${_arch}" ../
+    make
+    popd
+  done
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    for _arch in ${_architectures}; do
-        pushd build-${_arch}
-        make install
-        popd
-    done
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  for _arch in ${_architectures}; do
+    pushd build-${_arch}
+    make install-mingw-w64-strip
+    popd
+  done
 }
diff --git a/dbus-soundrecorder/default/PKGBUILD b/dbus-soundrecorder/default/PKGBUILD
index fe2d3ced..96b0e2a1 100644
--- a/dbus-soundrecorder/default/PKGBUILD
+++ b/dbus-soundrecorder/default/PKGBUILD
@@ -1,24 +1,24 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _reponame=dbus-soundrecorder
 pkgname=dbus-soundrecorder
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="Records sound from Pulse Audio using ffmpeg while watching D-Bus to determine tracks and meta data."
 license=('GPL')
-depends=('c++utilities')
-makedepends=('qt5-base')
+depends=('c++utilities' 'qt5-base')
+makedepends=('cmake')
 url="https://github.com/Martchus/${_reponame}"
 source=("dbus-soundrecorder-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('0af1914803cf2f1d11fdb8e46f6c896a18040f6606a08d0742356dc0c7872261')
+sha256sums=('702a384a756ece708c97ceea6c447ee74d8e5a664ace9a305225c56a3972a4dc')
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro"
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  make
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
diff --git a/diriterator/default/PKGBUILD b/diriterator/default/PKGBUILD
index a997590f..67746d9a 100755
--- a/diriterator/default/PKGBUILD
+++ b/diriterator/default/PKGBUILD
@@ -18,5 +18,5 @@ noextract=
 md5sums=('SKIP')
 
 package() {
-    install -Dm755 "${srcdir}/${PROJECT_DIR_NAME:-$pkgname-$pkgver}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm755 "${srcdir}/${PROJECT_DIR_NAME:-$pkgname-$pkgver}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
 }
diff --git a/evince/mingw-w64/0002-missing-include.patch b/evince/mingw-w64/0002-missing-include.patch
new file mode 100644
index 00000000..f6247fb1
--- /dev/null
+++ b/evince/mingw-w64/0002-missing-include.patch
@@ -0,0 +1,10 @@
+--- evince-3.18.0/backend/pdf/ev-poppler.cc.orig	2015-09-25 12:25:31.343557800 +0300
++++ evince-3.18.0/backend/pdf/ev-poppler.cc	2015-09-25 12:25:48.411850800 +0300
+@@ -23,6 +23,7 @@
+ 
+ #include <math.h>
+ #include <string.h>
++#include <unistd.h>
+ #include <gtk/gtk.h>
+ #include <poppler.h>
+ #include <poppler-document.h>
diff --git a/evince/mingw-w64/PKGBUILD b/evince/mingw-w64/PKGBUILD
new file mode 100644
index 00000000..2e08d263
--- /dev/null
+++ b/evince/mingw-w64/PKGBUILD
@@ -0,0 +1,76 @@
+_name=evince
+pkgname=mingw-w64-evince
+pkgver=3.18.2
+pkgrel=1
+pkgdesc="Document viewer (build with PDF support only, mingw-w64)"
+url="https://wiki.gnome.org/Apps/Evince"
+arch=('any')
+license=('GPL')
+depends=('mingw-w64-crt' 'mingw-w64-gtk3' 'mingw-w64-poppler' 'mingw-w64-libxml2')
+makedepends=('itstool' 'intltool' 'mingw-w64-gcc' 'mingw-w64-configure' 'mingw-w64-binutils')
+install=
+source=(http://ftp.gnome.org/pub/gnome/sources/${_name}/${pkgver:0:4}/${_name}-$pkgver.tar.xz
+        0002-missing-include.patch)
+sha256sums=('42ad6c7354d881a9ecab136ea84ff867acb942605bcfac48b6c12e1c2d8ecb17'
+            'd2850c4bdfa87fa56bae2674d2c798f9181bfb3f19319fbc9966672caae48237')
+options=(!buildflags staticlibs !strip !emptydirs)
+_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+
+prepare() {
+  cd "${srcdir}/${_name}-${pkgver}"
+  patch -p1 -i "${srcdir}/0002-missing-include.patch"
+}
+
+build() {
+  cd "${srcdir}/${_name}-${pkgver}"
+
+  for _arch in ${_architectures}; do
+    mkdir "build-${_arch}"
+    pushd "build-${_arch}"
+    ${_arch}-configure \
+        --exec-prefix=/usr/${_arch} \
+        --sysconfdir=/etc \
+        --prefix=/usr/${_arch} \
+        --localstatedir=/var \
+        --with-platform=win32 \
+        --disable-debug \
+        --disable-maintainer-mode \
+        --disable-schemas-compile \
+        --enable-viewer \
+        --disable-previewer \
+        --disable-thumbnailer \
+        --enable-pdf \
+        --disable-ps \
+        --disable-djvu \
+        --disable-dvi \
+        --disable-xps \
+        --disable-comics \
+        --enable-t1lib \
+        --enable-tiff \
+        --disable-nautilus \
+        --disable-browser-plugin \
+        --disable-gtk-doc \
+        --disable-introspection \
+        --disable-dbus \
+        --without-keyring \
+        --without-gtk-unix-print \
+        --disable-libgnome-desktop
+    make
+    popd
+  done
+}
+
+package() {
+  cd "${srcdir}/${_name}-${pkgver}"
+  for _arch in ${_architectures}; do
+    pushd "build-${_arch}"
+    alias strip=${_arch}-strip
+    make DESTDIR="${pkgdir}" install
+    ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a
+    ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/${_name}/4/backends/"*.a
+    ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/${_name}/4/backends/"*.dll
+    ${_arch}-strip --strip-all "${pkgdir}/usr/${_arch}/bin/"*.exe
+    ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll
+    popd
+  done
+}
diff --git a/evince/mingw-w64/ev_spawn.patch b/evince/mingw-w64/ev_spawn.patch
new file mode 100644
index 00000000..55047f57
--- /dev/null
+++ b/evince/mingw-w64/ev_spawn.patch
@@ -0,0 +1,105 @@
+diff -rupN evince-3.16.1/shell/ev-application.c src/evince-3.16.1/shell/ev-application.c
+--- evince-3.16.1/shell/ev-application.c	2015-05-27 12:02:51.000000000 +0200
++++ src/evince-3.16.1/shell/ev-application.c	2015-07-25 14:18:31.886559695 +0200
+@@ -44,6 +44,12 @@
+ #include "ev-media-player-keys.h"
+ #endif /* ENABLE_DBUS */
+ 
++#ifdef G_OS_WIN32
++#include <wtypesbase.h>
++#include <shellapi.h>
++#include <winuser.h>
++#endif
++
+ struct _EvApplication {
+ 	GtkApplication base_instance;
+ 
+@@ -172,8 +178,12 @@ ev_spawn (const char     *uri,
+ 	path = g_build_filename (BINDIR, "evince", NULL);
+ #endif
+ 
++	#ifndef G_OS_WIN32
+ 	g_string_append_printf (cmd, " %s", path);
+ 	g_free (path);
++	#else
++	g_string_append_printf (cmd, "%s", "");
++	#endif
+ 	
+ 	/* Page label */
+ 	if (dest) {
+@@ -212,34 +222,50 @@ ev_spawn (const char     *uri,
+ 		break;
+ 	}
+ 
+-	cmdline = g_string_free (cmd, FALSE);
+-	app = g_app_info_create_from_commandline (cmdline, NULL, 0, &error);
+ 
+-	if (app != NULL) {
+-                GList uri_list;
+-                GList *uris = NULL;
+-		GdkAppLaunchContext *ctx;
+-
+-		ctx = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
+-		gdk_app_launch_context_set_screen (ctx, screen);
+-		gdk_app_launch_context_set_timestamp (ctx, timestamp);
+-
+-                /* Some URIs can be changed when passed through a GFile
+-                 * (for instance unsupported uris with strange formats like mailto:),
+-                 * so if you have a textual uri you want to pass in as argument,
+-                 * consider using g_app_info_launch_uris() instead.
+-                 * See https://bugzilla.gnome.org/show_bug.cgi?id=644604
+-                 */
+-                if (uri) {
+-                        uri_list.data = (gchar *)uri;
+-                        uri_list.prev = uri_list.next = NULL;
+-                        uris = &uri_list;
+-                }
+-		g_app_info_launch_uris (app, uris, G_APP_LAUNCH_CONTEXT (ctx), &error);
++	#ifdef G_OS_WIN32
++		g_string_append(cmd, " ");
++		g_string_append(cmd, uri);
++	#endif
++
++	cmdline = g_string_free (cmd, FALSE);
+ 
+-		g_object_unref (app);
+-		g_object_unref (ctx);
++	#ifdef G_OS_WIN32
++	{
++		ShellExecute(NULL,"open",path,cmdline,"",SW_SHOWDEFAULT);
++		fprintf(stderr, "INFO: Spawning evince process with command line '%s %s'\n",path,cmdline);
++		g_free(path);
+ 	}
++	#else
++		app = g_app_info_create_from_commandline (cmdline, NULL, 0, &error);
++	
++		if (app != NULL) {
++	                GList uri_list;
++	                GList *uris = NULL;
++			GdkAppLaunchContext *ctx;
++	
++	
++			ctx = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
++			gdk_app_launch_context_set_screen (ctx, screen);
++			gdk_app_launch_context_set_timestamp (ctx, timestamp);
++	
++	                /* Some URIs can be changed when passed through a GFile
++	                 * (for instance unsupported uris with strange formats like mailto:),
++	                 * so if you have a textual uri you want to pass in as argument,
++	                 * consider using g_app_info_launch_uris() instead.
++	                 * See https://bugzilla.gnome.org/show_bug.cgi?id=644604
++	                 */
++	                if (uri) {
++	                        uri_list.data = (gchar *)uri;
++	                        uri_list.prev = uri_list.next = NULL;
++	                        uris = &uri_list;
++	                }
++			g_app_info_launch_uris (app, uris, G_APP_LAUNCH_CONTEXT (ctx), &error);
++	
++			g_object_unref (app);
++			g_object_unref (ctx);
++		}
++	#endif
+ 
+ 	if (error != NULL) {
+ 		g_printerr ("Error launching evince %s: %s\n", uri, error->message);
diff --git a/ffmpeg-libfdk_aac-git/git/PKGBUILD b/ffmpeg-libfdk_aac-git/git/PKGBUILD
index 627d51e7..c1f95eaa 100644
--- a/ffmpeg-libfdk_aac-git/git/PKGBUILD
+++ b/ffmpeg-libfdk_aac-git/git/PKGBUILD
@@ -7,22 +7,18 @@ pkgdesc='Complete solution to record, convert and stream audio and video (Same a
 arch=('i686' 'x86_64')
 url='http://ffmpeg.org/'
 license=('GPL3' 'custom:libfdk-aac')
-depends=(
-      'alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gnutls' 'gsm' 'lame' 'libass'
-      'libbluray' 'libmodplug' 'libpulse' 'libsoxr' 'libssh' 'libtheora'
-      'libva' 'libvdpau' 'libwebp' 'opencore-amr' 'openjpeg' 'opus'
-      'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib'
-      'libvorbis.so' 'libvorbisenc.so' 'libvpx.so' 'libx264.so' 'libx265.so'
-      'libfdk-aac'
-      )
+depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gnutls' 'gsm' 'lame' 'libass'
+         'libbluray' 'libmodplug' 'libpulse' 'libsoxr' 'libssh' 'libtheora'
+         'libva' 'libvdpau' 'libwebp' 'opencore-amr' 'openjpeg' 'opus'
+         'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib'
+         'libvorbis.so' 'libvorbisenc.so' 'libvpx.so' 'libx264.so' 'libx265.so'
+         'libfdk-aac')
 makedepends=('hardening-wrapper' 'ladspa' 'libvdpau' 'yasm' 'git')
 optdepends=('ladspa: LADSPA filters')
-provides=(
-      "ffmpeg=$pkgver"
-      'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
-      'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
-      'libswscale.so'
-)
+provides=("ffmpeg=$pkgver"
+          'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
+          'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
+          'libswscale.so')
 conflicts=("$_name")
 source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git')
 md5sums=('SKIP')
diff --git a/freetype2/mingw-w64-bootstrap/PKGBUILD b/freetype2/mingw-w64-bootstrap/PKGBUILD
index 5578d980..355c9d08 100644
--- a/freetype2/mingw-w64-bootstrap/PKGBUILD
+++ b/freetype2/mingw-w64-bootstrap/PKGBUILD
@@ -29,33 +29,33 @@ validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
-    cd "${srcdir}/freetype-${pkgver}"
-    patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch"
-    patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch"
+  cd "${srcdir}/freetype-${pkgver}"
+  patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch"
+  patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch"
 
-    # https://bugs.archlinux.org/task/35274
-    patch -Np1 -i "${srcdir}/0003-Enable-subpixel-hinting.patch"
-    # Provide a way to enable the above patch at runtime.
-    # Hopefully just a temporary measure until fontconfig picks up
-    # the necessary configurables.
-    patch -Np1 -i "${srcdir}/0004-Mask-subpixel-hinting-with-an-env-var.patch"
+  # https://bugs.archlinux.org/task/35274
+  patch -Np1 -i "${srcdir}/0003-Enable-subpixel-hinting.patch"
+  # Provide a way to enable the above patch at runtime.
+  # Hopefully just a temporary measure until fontconfig picks up
+  # the necessary configurables.
+  patch -Np1 -i "${srcdir}/0004-Mask-subpixel-hinting-with-an-env-var.patch"
 }
 
 build() {
-    for _arch in ${_architectures}; do
-        mkdir -p "${srcdir}/freetype-${pkgver}/build-${_arch}"
-        cd "${srcdir}/freetype-${pkgver}/build-${_arch}"
-        ${_arch}-configure --with-zlib=/usr/${_arch} --without-png
-        make
-    done
+  for _arch in ${_architectures}; do
+    mkdir -p "${srcdir}/freetype-${pkgver}/build-${_arch}"
+    cd "${srcdir}/freetype-${pkgver}/build-${_arch}"
+    ${_arch}-configure --with-zlib=/usr/${_arch} --without-png
+    make
+  done
 }
 
 package() {
-    for _arch in ${_architectures}; do
-        cd "${srcdir}/freetype-${pkgver}/build-${_arch}"
-        make DESTDIR="${pkgdir}" install
-        rm -rf "${pkgdir}/usr/${_arch}/share/"
-        ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a
-        ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
-    done
+  for _arch in ${_architectures}; do
+    cd "${srcdir}/freetype-${pkgver}/build-${_arch}"
+    make DESTDIR="${pkgdir}" install
+    rm -rf "${pkgdir}/usr/${_arch}/share/"
+    ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a
+    ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
+  done
 }
diff --git a/freetype2/mingw-w64/PKGBUILD b/freetype2/mingw-w64/PKGBUILD
index 323004a7..4fb9a911 100644
--- a/freetype2/mingw-w64/PKGBUILD
+++ b/freetype2/mingw-w64/PKGBUILD
@@ -30,33 +30,33 @@ validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
-    cd "${srcdir}/freetype-${pkgver}"
-    patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch"
-    patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch"
+  cd "${srcdir}/freetype-${pkgver}"
+  patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch"
+  patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch"
 
-    # https://bugs.archlinux.org/task/35274
-    patch -Np1 -i "${srcdir}/0003-Enable-subpixel-hinting.patch"
-    # Provide a way to enable the above patch at runtime.
-    # Hopefully just a temporary measure until fontconfig picks up
-    # the necessary configurables.
-    patch -Np1 -i "${srcdir}/0004-Mask-subpixel-hinting-with-an-env-var.patch"
+  # https://bugs.archlinux.org/task/35274
+  patch -Np1 -i "${srcdir}/0003-Enable-subpixel-hinting.patch"
+  # Provide a way to enable the above patch at runtime.
+  # Hopefully just a temporary measure until fontconfig picks up
+  # the necessary configurables.
+  patch -Np1 -i "${srcdir}/0004-Mask-subpixel-hinting-with-an-env-var.patch"
 }
 
 build() {
-    for _arch in ${_architectures}; do
-        mkdir -p "${srcdir}/freetype-${pkgver}/build-${_arch}"
-        cd "${srcdir}/freetype-${pkgver}/build-${_arch}"
-        ${_arch}-configure --with-zlib=/usr/${_arch} --without-png
-        make
-    done
+  for _arch in ${_architectures}; do
+    mkdir -p "${srcdir}/freetype-${pkgver}/build-${_arch}"
+    cd "${srcdir}/freetype-${pkgver}/build-${_arch}"
+    ${_arch}-configure --with-zlib=/usr/${_arch} --without-png
+    make
+  done
 }
 
 package() {
-    for _arch in ${_architectures}; do
-        cd "${srcdir}/freetype-${pkgver}/build-${_arch}"
-        make DESTDIR="${pkgdir}" install
-        rm -rf "${pkgdir}/usr/${_arch}/share/"
-        ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a
-        ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
-    done
+  for _arch in ${_architectures}; do
+    cd "${srcdir}/freetype-${pkgver}/build-${_arch}"
+    make DESTDIR="${pkgdir}" install
+    rm -rf "${pkgdir}/usr/${_arch}/share/"
+    ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a
+    ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
+  done
 }
diff --git a/geany/mingw-w64/PKGBUILD b/geany/mingw-w64/PKGBUILD
new file mode 100644
index 00000000..efe7fa90
--- /dev/null
+++ b/geany/mingw-w64/PKGBUILD
@@ -0,0 +1,66 @@
+# Maintainer: Martchus <martchus@gmx.net>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Ionut Biru  <ibiru@archlinux.ro>
+# Contributor: William Rea <sillywilly@gmail.com>
+# Contributor: Allan McRae <mcrae_allan@hotmail.com>
+
+_name=geany
+pkgname=mingw-w64-geany
+pkgver=1.26
+pkgrel=1
+pkgdesc='Fast and lightweight IDE (mingw-w64)'
+arch=('any')
+url='http://www.geany.org/'
+license=('GPL')
+depends=('mingw-w64-crt' 'mingw-w64-gtk2')
+makedepends=('perl-xml-parser' 'setconf' 'intltool' 'mingw-w64-gcc' 'mingw-w64-configure' 'mingw-w64-binutils')
+optdepends=('mingw-w64-geany-plugins: various extra features'
+            'mingw-w64-python2')
+source=("http://download.geany.org/${_name}-$pkgver.tar.bz2")
+sha256sums=('e38530e87c577e1e9806be3b40e08fb9ee321eb1abc6361ddacdad89c825f90d')
+options=(!buildflags staticlibs !strip !emptydirs)
+
+_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+
+prepare() {
+  cd "${_name}-$pkgver"
+
+  # Python2 fix
+  sed -i '0,/on/s//on2/' data/templates/files/main.py
+
+  # Syntax highlighting for PKGBUILD files
+  sed -i 's/Sh=/Sh=PKGBUILD;/' data/filetype_extensions.conf
+}
+
+build() {
+  cd "${_name}-$pkgver"
+  for _arch in ${_architectures}; do
+    mkdir -p "build-${_arch}"
+    pushd "build-${_arch}"
+    ${_arch}-configure \
+        --exec-prefix=/usr/${_arch} \
+        --sysconfdir=/etc \
+        --prefix=/usr/${_arch}
+    make
+    popd
+  done
+}
+
+package() {
+  cd "${_name}-$pkgver"
+  for _arch in ${_architectures}; do
+    pushd "build-${_arch}"
+    make DESTDIR="$pkgdir" install
+    ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a
+    ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/geany/"*.a
+    ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/geany/"*.dll
+    ${_arch}-strip --strip-all "${pkgdir}/usr/${_arch}/bin/"*.exe
+    ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll
+    rm "${pkgdir}/usr/${_arch}/"*.txt
+    popd
+  done
+}
+
+# getver: -u 7 geany.org/Documentation/ReleaseNotes
+# vim:set ts=2 sw=2 et:
diff --git a/geocoordinatecalculator/default/PKGBUILD b/geocoordinatecalculator/default/PKGBUILD
index 6f2ccc00..74dc8e77 100644
--- a/geocoordinatecalculator/default/PKGBUILD
+++ b/geocoordinatecalculator/default/PKGBUILD
@@ -1,24 +1,24 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _reponame=geocoordinatecalculator
 pkgname=geocoordinatecalculator
-pkgver=1.0.1
+pkgver=1.1.0
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="Tool for basic calculations with geo coordinates such as format conversions and calculation of distance, bearing, mid point, destination and more."
 license=('GPL')
 depends=('c++utilities')
-makedepends=('qt5-base')
+makedepends=('cmake')
 url="https://github.com/Martchus/${_reponame}"
 source=("geocoordinatecalculator-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('5eeeb11027e93bf676977877013756ccb17047d539596f24d20ab8b3787c9cbf')
+sha256sums=('56112c7064086d30652dc0aa4c4d6fc3bbde7fbef4208fde2ea4d176cd7e9e9a')
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro"
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  make
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
diff --git a/geocoordinatecalculator/mingw-w64/PKGBUILD b/geocoordinatecalculator/mingw-w64/PKGBUILD
index 0ec9ed55..3b14e9c4 100644
--- a/geocoordinatecalculator/mingw-w64/PKGBUILD
+++ b/geocoordinatecalculator/mingw-w64/PKGBUILD
@@ -2,34 +2,35 @@
 _name=geocoordinatecalculator
 _reponame=geocoordinatecalculator
 pkgname=mingw-w64-geocoordinatecalculator
-pkgver=1.0.1
+pkgver=1.1.0
 pkgrel=1
 arch=('any')
 pkgdesc="Tool for basic calculations with geo coordinates such as format conversions and calculation of distance, bearing, mid point, destination and more (mingw-w64)."
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-c++utilities')
-makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-base')
+makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
 url="https://github.com/Martchus/${_reponame}"
 source=("geocoordinatecalculator-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('SKIP')
+sha256sums=('56112c7064086d30652dc0aa4c4d6fc3bbde7fbef4208fde2ea4d176cd7e9e9a')
+options=(!buildflags staticlibs !strip !emptydirs)
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    # build for each architecture
-    for _arch in ${_architectures}; do
-        mkdir -p build-${_arch} && pushd build-${_arch}
-        INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-exe CONFIG+=mingw-w64-noversion
-        make
-        popd
-    done
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  # build utilities for each architecture
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/${_arch}" ../
+    make
+    popd
+  done
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    for _arch in ${_architectures}; do       
-        pushd build-${_arch}
-        make install
-        popd
-    done
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  for _arch in ${_architectures}; do
+    pushd build-${_arch}
+    make install-mingw-w64-strip
+    popd
+  done
 }
diff --git a/gsm/mingw-w64/PKGBUILD b/gsm/mingw-w64/PKGBUILD
new file mode 100644
index 00000000..0b01024d
--- /dev/null
+++ b/gsm/mingw-w64/PKGBUILD
@@ -0,0 +1,69 @@
+# Maintainer: Karl-Felix Glatzer <karl.glatzer@gmx.de>
+_name=gsm
+pkgname=mingw-w64-gsm
+pkgver=1.0.14
+pkgrel=1
+pkgdesc="Shared libraries for GSM 06.10 lossy speech compression (mingw-w64)"
+arch=('any')
+url="http://www.quut.com/gsm/"
+license=('custom')
+options=(!strip !buildflags staticlibs)
+depends=('mingw-w64-crt')
+makedepends=('mingw-w64-gcc')
+source=("http://www.quut.com/${_name}/${_name}-${pkgver}.tar.gz"
+        'gsm.patch'
+        'makefile.patch'
+        'win32.patch')
+md5sums=('4cbb4e7b73842de3d12d30b0d74200d4'
+         '30f46c92d0a5e5654258e707a9e8b5a6'
+         '1f17f4c181769a091891092e1fdc1e3c'
+         'bb2919748d4ed7eb3174af976126f501')
+_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+
+prepare() {
+  cd "${srcdir}/gsm-${pkgver%.*}-pl${pkgver##*.}/"
+
+  patch -Np0 -i "${srcdir}/${_name}.patch"
+  patch -Np1 -i "${srcdir}/makefile.patch"
+  patch -Np1 -i "${srcdir}/win32.patch"
+}
+
+build() {
+  for _arch in ${_architectures}; do
+    cp -r ${srcdir}/gsm-${pkgver%.*}-pl${pkgver##*.} ${srcdir}/build-${_arch} && cd ${srcdir}/build-${_arch}
+
+    unset LDFLAGS CPPFLAGS
+    make -f Makefile.mingw64 \
+      CC=${_arch}-gcc \
+      AR=${_arch}-ar \
+      RANLIB=${_arch}-ranlib
+  done
+}
+
+package() {
+  for _arch in ${_architectures}; do
+    cd ${srcdir}/build-${_arch}
+
+    # Prepare directories
+    install -m755 -d ${pkgdir}/usr/${_arch}/{bin,lib,include/gsm,share/{licenses/gsm,man/man{1,3}}}
+
+    unset LDFLAGS CPPFLAGS
+    make -f Makefile.mingw64 \
+      CC="${_arch}-gcc" \
+      AR=${_arch}-ar \
+      RANLIB=${_arch}-ranlib \
+      INSTALL_ROOT=${pkgdir}/usr/${_arch} \
+      GSM_INSTALL_INC=${pkgdir}/usr/${_arch}/include/gsm \
+      GSM_INSTALL_MAN=${pkgdir}/usr/${_arch}/share/man/man3 \
+      TOAST_INSTALL_MAN=${pkgdir}/usr/${_arch}/share/man/man1 \
+      install
+
+    # Install license
+    install -m644 COPYRIGHT ${pkgdir}/usr/${_arch}/share/licenses/gsm/license.txt
+
+    ${_arch}-strip -x -g "${pkgdir}/usr/${_arch}/bin/"*.dll
+    ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a
+    rm ${pkgdir}/usr/${_arch}/bin/*.exe
+    rm -r ${pkgdir}/usr/${_arch}/share/man
+  done
+}
diff --git a/gsm/mingw-w64/gsm.patch b/gsm/mingw-w64/gsm.patch
new file mode 100644
index 00000000..821f3a59
--- /dev/null
+++ b/gsm/mingw-w64/gsm.patch
@@ -0,0 +1,198 @@
+--- Makefile	2006-04-26 15:14:26.000000000 -0400
++++ Makefile	2010-06-19 16:53:25.000000000 -0400
+@@ -44,7 +44,7 @@
+ # CCFLAGS 	= -c -O
+ 
+ CC		= gcc -ansi -pedantic
+-CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1
++CCFLAGS 	= -c -O2 -fPIC -DNeedFunctionPrototypes=1
+ 
+ LD 		= $(CC)
+ 
+@@ -96,11 +96,11 @@
+ #  Other tools
+ 
+ SHELL		= /bin/sh
+-LN		= ln
++LN		= ln -s -f
+ BASENAME 	= basename
+ AR		= ar
+ ARFLAGS		= cr
+-RMFLAGS		=
++RMFLAGS		= -f
+ FIND		= find
+ COMPRESS 	= compress
+ COMPRESSFLAGS 	= 
+@@ -139,7 +139,7 @@
+ 
+ # Targets
+ 
+-LIBGSM	= $(LIB)/libgsm.a
++LIBGSMSO = $(LIB)/libgsm.so
+ 
+ TOAST	= $(BIN)/toast
+ UNTOAST	= $(BIN)/untoast
+@@ -257,7 +257,7 @@
+ # Install targets
+ 
+ GSM_INSTALL_TARGETS =	\
+-		$(GSM_INSTALL_LIB)/libgsm.a		\
++		$(GSM_INSTALL_LIB)/libgsm.so		\
+ 		$(GSM_INSTALL_INC)/gsm.h		\
+ 		$(GSM_INSTALL_MAN)/gsm.3		\
+ 		$(GSM_INSTALL_MAN)/gsm_explode.3	\
+@@ -279,7 +279,7 @@
+ 
+ # Target rules
+ 
+-all:		$(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
++all:		$(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST)
+ 		@-echo $(ROOT): Done.
+ 
+ tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
+@@ -299,24 +299,23 @@
+ 
+ # The basic API: libgsm
+ 
+-$(LIBGSM):	$(LIB) $(GSM_OBJECTS)
+-		-rm $(RMFLAGS) $(LIBGSM)
+-		$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
+-		$(RANLIB) $(LIBGSM)
+-
++$(LIBGSMSO): $(LIB) $(GSM_OBJECTS)
++	$(LD) -shared -Wl,-soname,libgsm.so.1 -o $@.1.0.13 $(GSM_OBJECTS)
++	$(LN) libgsm.so.1.0.13 $(LIBGSMSO).1
++	$(LN) libgsm.so.1.0.13 $(LIBGSMSO)
+ 
+ # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
+ 
+-$(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSM)
+-		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
++$(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSMSO)
++		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB)
+ 
+ $(UNTOAST):	$(BIN) $(TOAST)
+ 		-rm $(RMFLAGS) $(UNTOAST)
+-		$(LN) $(TOAST) $(UNTOAST)
++		$(LN) toast $(UNTOAST)
+ 
+ $(TCAT):	$(BIN) $(TOAST)
+ 		-rm $(RMFLAGS) $(TCAT)
+-		$(LN) $(TOAST) $(TCAT)
++		$(LN) toast $(TCAT)
+ 
+ 
+ # The local bin and lib directories
+@@ -351,53 +350,54 @@
+ 		fi
+ 
+ $(TOAST_INSTALL_BIN)/toast:	$(TOAST)
+-		-rm $@
++		-rm $(RMFLAGS) $@
+ 		cp $(TOAST) $@
+ 		chmod 755 $@
+ 
+ $(TOAST_INSTALL_BIN)/untoast:	$(TOAST_INSTALL_BIN)/toast
+-		-rm $@
+-		ln $? $@
++		-rm $(RMFLAGS) $@
++		$(LN) toast $@
+ 
+ $(TOAST_INSTALL_BIN)/tcat:	$(TOAST_INSTALL_BIN)/toast
+-		-rm $@
+-		ln $? $@
++		-rm $(RMFLAGS) $@
++		$(LN) toast $@
+ 
+ $(TOAST_INSTALL_MAN)/toast.1:	$(MAN)/toast.1
+-		-rm $@
++		-rm $(RMFLAGS) $@
+ 		cp $? $@
+ 		chmod 444 $@
+ 
+ $(GSM_INSTALL_MAN)/gsm.3:	$(MAN)/gsm.3
+-		-rm $@
++		-rm $(RMFLAGS) $@
+ 		cp $? $@
+ 		chmod 444 $@
+ 
+ $(GSM_INSTALL_MAN)/gsm_option.3:	$(MAN)/gsm_option.3
+-		-rm $@
++		-rm $(RMFLAGS) $@
+ 		cp $? $@
+ 		chmod 444 $@
+ 
+ $(GSM_INSTALL_MAN)/gsm_explode.3:	$(MAN)/gsm_explode.3
+-		-rm $@
++		-rm $(RMFLAGS) $@
+ 		cp $? $@
+ 		chmod 444 $@
+ 
+ $(GSM_INSTALL_MAN)/gsm_print.3:	$(MAN)/gsm_print.3
+-		-rm $@
++		-rm $(RMFLAGS) $@
+ 		cp $? $@
+ 		chmod 444 $@
+ 
+ $(GSM_INSTALL_INC)/gsm.h:	$(INC)/gsm.h
+-		-rm $@
+-		cp $? $@
+-		chmod 444 $@
+-
+-$(GSM_INSTALL_LIB)/libgsm.a:	$(LIBGSM)
+-		-rm $@
++		-rm $(RMFLAGS) $@
+ 		cp $? $@
+ 		chmod 444 $@
+ 
++$(GSM_INSTALL_LIB)/libgsm.so:	$(LIBGSMSO)
++		-rm $(RMFLAGS) $@ $@.1 $@.1.0.13
++		cp $?.1.0.13 $@.1.0.13
++		chmod 755 $@.1.0.13
++		$(LN) libgsm.so.1.0.13 $@
++		$(LN) libgsm.so.1.0.13 $@.1
+ 
+ # Distribution
+ 
+@@ -425,7 +425,7 @@
+ 			-print | xargs rm $(RMFLAGS)
+ 
+ clean:	semi-clean
+-		-rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add		\
++		-rm $(RMFLAGS) $(LIBGSMSO)* $(ADDTST)/add		\
+ 			$(TOAST) $(TCAT) $(UNTOAST)	\
+ 			$(ROOT)/gsm-1.0.tar.Z
+ 
+@@ -473,22 +473,22 @@
+ $(TST)/test-result:	$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/run
+ 			( cd $(TST); ./run ) 
+ 
+-$(TST)/lin2txt:		$(TST)/lin2txt.o $(LIBGSM)
++$(TST)/lin2txt:		$(TST)/lin2txt.o $(LIBGSMSO)
+ 			$(LD) $(LFLAGS) -o $(TST)/lin2txt \
+-				$(TST)/lin2txt.o $(LIBGSM) $(LDLIB)
++				$(TST)/lin2txt.o $(LIBGSMSO) $(LDLIB)
+ 
+-$(TST)/lin2cod:		$(TST)/lin2cod.o $(LIBGSM)
++$(TST)/lin2cod:		$(TST)/lin2cod.o $(LIBGSMSO)
+ 			$(LD) $(LFLAGS) -o $(TST)/lin2cod \
+-				$(TST)/lin2cod.o $(LIBGSM) $(LDLIB)
++				$(TST)/lin2cod.o $(LIBGSMSO) $(LDLIB)
+ 
+-$(TST)/gsm2cod:		$(TST)/gsm2cod.o $(LIBGSM)
++$(TST)/gsm2cod:		$(TST)/gsm2cod.o $(LIBGSMSO)
+ 			$(LD) $(LFLAGS) -o $(TST)/gsm2cod \
+-				$(TST)/gsm2cod.o $(LIBGSM) $(LDLIB)
++				$(TST)/gsm2cod.o $(LIBGSMSO) $(LDLIB)
+ 
+-$(TST)/cod2txt:		$(TST)/cod2txt.o $(LIBGSM)
++$(TST)/cod2txt:		$(TST)/cod2txt.o $(LIBGSMSO)
+ 			$(LD) $(LFLAGS) -o $(TST)/cod2txt \
+-				$(TST)/cod2txt.o $(LIBGSM) $(LDLIB)
++				$(TST)/cod2txt.o $(LIBGSMSO) $(LDLIB)
+ 
+-$(TST)/cod2lin:		$(TST)/cod2lin.o $(LIBGSM)
++$(TST)/cod2lin:		$(TST)/cod2lin.o $(LIBGSMSO)
+ 			$(LD) $(LFLAGS) -o $(TST)/cod2lin \
+-				$(TST)/cod2lin.o $(LIBGSM) $(LDLIB)
++				$(TST)/cod2lin.o $(LIBGSMSO) $(LDLIB)
diff --git a/gsm/mingw-w64/makefile.patch b/gsm/mingw-w64/makefile.patch
new file mode 100644
index 00000000..8b3c9467
--- /dev/null
+++ b/gsm/mingw-w64/makefile.patch
@@ -0,0 +1,519 @@
+--- gsm-1.0-pl13/Makefile.mingw64	1970-01-01 01:00:00.000000000 +0100
++++ patched/Makefile.mingw64	2013-06-14 18:09:26.811006596 +0200
+@@ -0,0 +1,516 @@
++# Copyright 1992-1996 by Jutta Degener and Carsten Bormann, Technische
++# Universitaet Berlin.  See the accompanying file "COPYRIGHT" for
++# details.  THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
++
++# Machine- or installation dependent flags you should configure to port
++
++SASR	= -DSASR
++######### Define SASR if >> is a signed arithmetic shift (-1 >> 1 == -1)
++
++# MULHACK = -DUSE_FLOAT_MUL
++######### Define this if your host multiplies floats faster than integers,
++######### e.g. on a SPARCstation.
++
++# FAST	= -DFAST
++######### Define together with USE_FLOAT_MUL to enable the GSM library's
++######### approximation option for incorrect, but good-enough results.
++
++# LTP_CUT	= -DLTP_CUT
++LTP_CUT	=
++######### Define to enable the GSM library's long-term correlation 
++######### approximation option---faster, but worse; works for
++######### both integer and floating point multiplications.
++######### This flag is still in the experimental stage.
++
++WAV49	= -DWAV49
++# WAV49	=
++######### Define to enable the GSM library's option to pack GSM frames 
++######### in the style used by the WAV #49 format.  If you want to write
++######### a tool that produces .WAV files which contain GSM-encoded data,
++######### define this, and read about the GSM_OPT_WAV49 option in the
++######### manual page on gsm_option(3).
++
++# Choose a compiler.  The code works both with ANSI and K&R-C.
++# Use -DNeedFunctionPrototypes to compile with, -UNeedFunctionPrototypes to
++# compile without, function prototypes in the header files.
++#
++# You can use the -DSTUPID_COMPILER to circumvent some compilers'
++# static limits regarding the number of subexpressions in a statement.
++
++# CC		= cc
++# CCFLAGS 	= -c -DSTUPID_COMPILER
++
++# CC		= /usr/lang/acc
++# CCFLAGS 	= -c -O
++
++CC?		= gcc
++CCFLAGS 	= -ansi -pedantic -c -O2 -DNeedFunctionPrototypes=1
++
++LD 		= $(CC)
++
++# LD		= gcc
++# LDFLAGS 	=
++
++
++# If your compiler needs additional flags/libraries, regardless of
++# the source compiled, configure them here.
++
++# CCINC	= -I/usr/gnu/lib/gcc-2.1/gcc-lib/sparc-sun-sunos4.1.2/2.1/include
++######### Includes needed by $(CC)
++
++# LDINC	= -L/usr/gnu/lib/gcc-2.1/gcc-lib/sparc-sun-sunos4.1.2/2.1
++######### Library paths needed by $(LD)
++
++# LDLIB	= -lgcc
++######### Additional libraries needed by $(LD)
++
++
++# Where do you want to install libraries, binaries, a header file
++# and the manual pages?
++#
++# Leave INSTALL_ROOT empty (or just don't execute "make install") to
++# not install gsm and toast outside of this directory.
++
++INSTALL_ROOT	=
++
++# Where do you want to install the gsm library, header file, and manpages?
++#
++# Leave GSM_INSTALL_ROOT empty to not install the GSM library outside of
++# this directory.
++
++GSM_INSTALL_ROOT = $(INSTALL_ROOT)
++GSM_INSTALL_BIN = $(GSM_INSTALL_ROOT)/bin
++GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
++GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
++GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
++
++
++# Where do you want to install the toast binaries and their manpage?
++#
++# Leave TOAST_INSTALL_ROOT empty to not install the toast binaries outside
++# of this directory.
++
++TOAST_INSTALL_ROOT	  = $(INSTALL_ROOT)
++TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
++TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1
++
++#  Other tools
++
++SHELL		= /bin/sh
++LN		= ln -s -f
++BASENAME 	= basename
++AR?		= ar
++ARFLAGS		= cr
++RMFLAGS		= -f
++FIND		= find
++COMPRESS 	= compress
++COMPRESSFLAGS 	= 
++# RANLIB 	= true
++RANLIB?	 	= ranlib
++
++#
++#    You shouldn't have to configure below this line if you're porting.
++# 
++
++
++# Local Directories
++
++ROOT	= .
++ADDTST	= $(ROOT)/add-test
++TST	= $(ROOT)/tst
++MAN	= $(ROOT)/man
++BIN	= $(ROOT)/bin
++SRC	= $(ROOT)/src
++LIB	= $(ROOT)/lib
++TLS	= $(ROOT)/tls
++INC	= $(ROOT)/inc
++
++# Flags
++
++# DEBUG	= -DNDEBUG
++######### Remove -DNDEBUG to enable assertions.
++
++CFLAGS	= $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
++	$(WAV49) $(CCINC) -I$(INC)
++######### It's $(CC) $(CFLAGS)
++
++LFLAGS	= $(LDFLAGS) $(LDINC)
++######### It's $(LD) $(LFLAGS)
++
++
++# Targets
++
++LIBGSM	= $(LIB)/libgsm.a
++LIBGSMIMPLIB = $(LIB)/libgsm.dll.a
++LIBGSMDLL = $(BIN)/libgsm.dll
++
++TOAST	= $(BIN)/toast.exe
++UNTOAST	= $(BIN)/untoast.exe
++TCAT	= $(BIN)/tcat.exe
++
++# Headers
++
++GSM_HEADERS =	$(INC)/gsm.h
++
++HEADERS	=	$(INC)/proto.h		\
++		$(INC)/unproto.h	\
++		$(INC)/config.h		\
++		$(INC)/private.h	\
++		$(INC)/gsm.h		\
++		$(INC)/toast.h		\
++		$(TLS)/taste.h
++
++# Sources
++
++GSM_SOURCES =	$(SRC)/add.c		\
++		$(SRC)/code.c		\
++		$(SRC)/debug.c		\
++		$(SRC)/decode.c		\
++		$(SRC)/long_term.c	\
++		$(SRC)/lpc.c		\
++		$(SRC)/preprocess.c	\
++		$(SRC)/rpe.c		\
++		$(SRC)/gsm_destroy.c	\
++		$(SRC)/gsm_decode.c	\
++		$(SRC)/gsm_encode.c	\
++		$(SRC)/gsm_explode.c	\
++		$(SRC)/gsm_implode.c	\
++		$(SRC)/gsm_create.c	\
++		$(SRC)/gsm_print.c	\
++		$(SRC)/gsm_option.c	\
++		$(SRC)/short_term.c	\
++		$(SRC)/table.c
++
++TOAST_SOURCES = $(SRC)/toast.c 		\
++		$(SRC)/toast_lin.c	\
++		$(SRC)/toast_ulaw.c	\
++		$(SRC)/toast_alaw.c	\
++		$(SRC)/toast_audio.c
++
++SOURCES	=	$(GSM_SOURCES)		\
++		$(TOAST_SOURCES)	\
++		$(ADDTST)/add_test.c	\
++		$(TLS)/sour.c		\
++		$(TLS)/ginger.c		\
++		$(TLS)/sour1.dta	\
++		$(TLS)/sour2.dta	\
++		$(TLS)/bitter.c		\
++		$(TLS)/bitter.dta	\
++		$(TLS)/taste.c		\
++		$(TLS)/sweet.c		\
++		$(TST)/cod2lin.c	\
++		$(TST)/cod2txt.c	\
++		$(TST)/gsm2cod.c	\
++		$(TST)/lin2cod.c	\
++		$(TST)/lin2txt.c
++
++# Object files
++
++GSM_OBJECTS =	$(SRC)/add.o		\
++		$(SRC)/code.o		\
++		$(SRC)/debug.o		\
++		$(SRC)/decode.o		\
++		$(SRC)/long_term.o	\
++		$(SRC)/lpc.o		\
++		$(SRC)/preprocess.o	\
++		$(SRC)/rpe.o		\
++		$(SRC)/gsm_destroy.o	\
++		$(SRC)/gsm_decode.o	\
++		$(SRC)/gsm_encode.o	\
++		$(SRC)/gsm_explode.o	\
++		$(SRC)/gsm_implode.o	\
++		$(SRC)/gsm_create.o	\
++		$(SRC)/gsm_print.o	\
++		$(SRC)/gsm_option.o	\
++		$(SRC)/short_term.o	\
++		$(SRC)/table.o
++
++TOAST_OBJECTS =	$(SRC)/toast.o 		\
++		$(SRC)/toast_lin.o	\
++		$(SRC)/toast_ulaw.o	\
++		$(SRC)/toast_alaw.o	\
++		$(SRC)/toast_audio.o
++
++OBJECTS =	 $(GSM_OBJECTS) $(TOAST_OBJECTS)
++
++# Manuals
++
++GSM_MANUALS =	$(MAN)/gsm.3		\
++		$(MAN)/gsm_explode.3	\
++		$(MAN)/gsm_option.3	\
++		$(MAN)/gsm_print.3
++
++TOAST_MANUALS =	$(MAN)/toast.1
++
++MANUALS	= 	$(GSM_MANUALS) $(TOAST_MANUALS) $(MAN)/bitter.1
++
++# Other stuff in the distribution
++
++STUFF = 	ChangeLog			\
++		INSTALL			\
++		MACHINES		\
++		MANIFEST		\
++		Makefile		\
++		README			\
++		$(ADDTST)/add_test.dta	\
++		$(TLS)/bitter.dta	\
++		$(TST)/run
++
++
++# Install targets
++
++GSM_INSTALL_TARGETS =	\
++		$(GSM_INSTALL_LIB)/libgsm.a		\
++		$(GSM_INSTALL_LIB)/libgsm.dll.a \
++		$(GSM_INSTALL_BIN)/libgsm.dll \
++		$(GSM_INSTALL_INC)/gsm.h		\
++		$(GSM_INSTALL_MAN)/gsm.3		\
++		$(GSM_INSTALL_MAN)/gsm_explode.3	\
++		$(GSM_INSTALL_MAN)/gsm_option.3		\
++		$(GSM_INSTALL_MAN)/gsm_print.3
++
++TOAST_INSTALL_TARGETS =	\
++		$(TOAST_INSTALL_BIN)/toast.exe		\
++		$(TOAST_INSTALL_BIN)/tcat.exe		\
++		$(TOAST_INSTALL_BIN)/untoast.exe		\
++		$(TOAST_INSTALL_MAN)/toast.1
++
++
++# Default rules
++
++.c.o:
++		$(CC) $(CFLAGS) $?
++		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
++
++# Target rules
++
++all:		$(LIBGSM) $(LIBGSMDLL) $(TOAST) $(TCAT) $(UNTOAST)
++		@-echo $(ROOT): Done.
++
++tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
++		@-echo tst: Done.
++
++addtst:		$(ADDTST)/add $(ADDTST)/add_test.dta
++		$(ADDTST)/add < $(ADDTST)/add_test.dta > /dev/null
++		@-echo addtst: Done.
++
++misc:		$(TLS)/sweet $(TLS)/bitter $(TLS)/sour $(TLS)/ginger 	\
++			$(TST)/lin2txt $(TST)/cod2txt $(TST)/gsm2cod
++		@-echo misc: Done.
++
++install:	toastinstall gsminstall
++		@-echo install: Done.
++
++
++# The basic API: libgsm
++
++$(LIBGSM):	$(LIB) $(GSM_OBJECTS)
++		-rm $(RMFLAGS) $(LIBGSM)
++		$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
++		$(RANLIB) $(LIBGSM)
++
++$(LIBGSMDLL):	$(LIB) $(GSM_OBJECTS)
++	$(LD) -shared -Wl,-soname,libgsm.dll.1 -Wl,-out-implib,$(LIBGSMIMPLIB) -o $@.1.0.13 $(GSM_OBJECTS)
++	$(LN) libgsm.dll.1.0.13 $(LIBGSMDLL).1
++	$(LN) libgsm.dll.1.0.13 $(LIBGSMDLL)
++
++
++# Toast, Untoast and Tcat -- the compress-like frontends to gsm.
++
++$(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSM) $(LIBGSMDLL)
++		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
++
++$(UNTOAST):	$(BIN) $(TOAST)
++		-rm $(RMFLAGS) $(UNTOAST)
++		$(LN) toast.exe $(UNTOAST)
++
++$(TCAT):	$(BIN) $(TOAST)
++		-rm $(RMFLAGS) $(TCAT)
++		$(LN) toast.exe $(TCAT)
++
++
++# The local bin and lib directories
++
++$(BIN):
++		if [ ! -d $(BIN) ] ; then mkdir $(BIN) ; fi
++
++$(LIB):
++		if [ ! -d $(LIB) ] ; then mkdir $(LIB) ; fi
++
++
++# Installation
++
++gsminstall:
++		-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then	\
++			make -f Makefile.mingw64 $(GSM_INSTALL_TARGETS) ;	\
++		fi
++
++toastinstall:
++		-if [ x"$(TOAST_INSTALL_ROOT)" != x ]; then	\
++			make -f Makefile.mingw64 $(TOAST_INSTALL_TARGETS);	\
++		fi
++
++gsmuninstall:
++		-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then	\
++			rm $(RMFLAGS) $(GSM_INSTALL_TARGETS) ;	\
++		fi
++
++toastuninstall:
++		-if [ x"$(TOAST_INSTALL_ROOT)" != x ] ; then 	\
++			rm $(RMFLAGS) $(TOAST_INSTALL_TARGETS);	\
++		fi
++
++$(TOAST_INSTALL_BIN)/toast.exe:	$(TOAST)
++		-rm $(RMFLAGS) $@
++		cp $(TOAST) $@
++		chmod 755 $@
++
++$(TOAST_INSTALL_BIN)/untoast.exe:	$(TOAST_INSTALL_BIN)/toast.exe
++		-rm $(RMFLAGS) $@
++		ln $(TOAST) $@
++
++$(TOAST_INSTALL_BIN)/tcat.exe:	$(TOAST_INSTALL_BIN)/toast.exe
++		-rm $(RMFLAGS) $@
++		ln $(TOAST) $@
++
++$(TOAST_INSTALL_MAN)/toast.1:	$(MAN)/toast.1
++		-rm $(RMFLAGS) $@
++		cp $? $@
++		chmod 444 $@
++
++$(GSM_INSTALL_MAN)/gsm.3:	$(MAN)/gsm.3
++		-rm $(RMFLAGS) $@
++		cp $? $@
++		chmod 444 $@
++
++$(GSM_INSTALL_MAN)/gsm_option.3:	$(MAN)/gsm_option.3
++		-rm $(RMFLAGS) $@
++		cp $? $@
++		chmod 444 $@
++
++$(GSM_INSTALL_MAN)/gsm_explode.3:	$(MAN)/gsm_explode.3
++		-rm $(RMFLAGS) $@
++		cp $? $@
++		chmod 444 $@
++
++$(GSM_INSTALL_MAN)/gsm_print.3:	$(MAN)/gsm_print.3
++		-rm $(RMFLAGS) $@
++		cp $? $@
++		chmod 444 $@
++
++$(GSM_INSTALL_INC)/gsm.h:	$(INC)/gsm.h
++		-rm $(RMFLAGS) $@
++		cp $? $@
++		chmod 444 $@
++
++$(GSM_INSTALL_LIB)/libgsm.a:	$(LIBGSM)
++		-rm $(RMFLAGS) $@
++		cp $? $@
++		chmod 444 $@
++
++$(GSM_INSTALL_BIN)/libgsm.dll:	$(LIBGSMDLL)
++		-rm $(RMFLAGS) $@ $@.1 $@.1.0.13
++		cp $?.1.0.13 $@.1.0.13
++		chmod 755 $@.1.0.13
++		$(LN) libgsm.dll.1.0.13 $@
++		$(LN) libgsm.dll.1.0.13 $@.1
++
++$(GSM_INSTALL_LIB)/libgsm.dll.a:	$(LIBGSMIMPLIB)
++		-rm $(RMFLAGS) $@
++		cp $? $@
++		chmod 755 $@
++
++
++# Distribution
++
++dist:		gsm-1.0.tar.Z
++		@echo dist: Done.
++
++gsm-1.0.tar.Z:	$(STUFF) $(SOURCES) $(HEADERS) $(MANUALS)
++		(	cd $(ROOT)/..;				\
++			tar cvf - `cat $(ROOT)/gsm-1.0/MANIFEST	\
++				| sed '/^#/d'`			\
++		) | $(COMPRESS) $(COMPRESSFLAGS) > $(ROOT)/gsm-1.0.tar.Z
++
++# Clean
++
++uninstall:	toastuninstall gsmuninstall
++		@-echo uninstall: Done.
++
++semi-clean:
++		-rm $(RMFLAGS)  */*.o			\
++			$(TST)/lin2cod $(TST)/lin2txt	\
++			$(TST)/cod2lin $(TST)/cod2txt	\
++			$(TST)/gsm2cod 			\
++			$(TST)/*.*.*
++		-$(FIND) . \( -name core -o -name foo \) \
++			-print | xargs rm $(RMFLAGS)
++
++clean:	semi-clean
++		-rm $(RMFLAGS) $(LIBGSM) $(LIBGSMDLL)* $(LIBGSMIMPLIB) $(ADDTST)/add		\
++			$(TOAST) $(TCAT) $(UNTOAST)	\
++			$(ROOT)/gsm-1.0.tar.Z
++
++
++# Two tools that helped me generate gsm_encode.c and gsm_decode.c,
++# but aren't generally needed to port this.
++
++$(TLS)/sweet:	$(TLS)/sweet.o $(TLS)/taste.o
++		$(LD) $(LFLAGS) -o $(TLS)/sweet \
++			$(TLS)/sweet.o $(TLS)/taste.o $(LDLIB)
++
++$(TLS)/bitter:	$(TLS)/bitter.o $(TLS)/taste.o
++		$(LD) $(LFLAGS) -o $(TLS)/bitter \
++			$(TLS)/bitter.o $(TLS)/taste.o $(LDLIB)
++
++# A version of the same family that Jeff Chilton used to implement
++# the WAV #49 GSM format.
++
++$(TLS)/ginger:	$(TLS)/ginger.o $(TLS)/taste.o
++		$(LD) $(LFLAGS) -o $(TLS)/ginger \
++			$(TLS)/ginger.o $(TLS)/taste.o $(LDLIB)
++
++$(TLS)/sour:	$(TLS)/sour.o $(TLS)/taste.o
++		$(LD) $(LFLAGS) -o $(TLS)/sour \
++			$(TLS)/sour.o $(TLS)/taste.o $(LDLIB)
++
++# Run $(ADDTST)/add < $(ADDTST)/add_test.dta to make sure the
++# basic arithmetic functions work as intended.
++
++$(ADDTST)/add:	$(ADDTST)/add_test.o
++		$(LD) $(LFLAGS) -o $(ADDTST)/add $(ADDTST)/add_test.o $(LDLIB)
++
++
++# Various conversion programs between linear, text, .gsm and the code
++# format used by the tests we ran (.cod).  We paid for the test data,
++# so I guess we can't just provide them with this package.  Still,
++# if you happen to have them lying around, here's the code.
++# 
++# You can use gsm2cod | cod2txt independently to look at what's
++# coded inside the compressed frames, although this shouldn't be
++# hard to roll on your own using the gsm_print() function from
++# the API.
++
++
++$(TST)/test-result:	$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/run
++			( cd $(TST); ./run ) 
++
++$(TST)/lin2txt:		$(TST)/lin2txt.o $(LIBGSM)
++			$(LD) $(LFLAGS) -o $(TST)/lin2txt \
++				$(TST)/lin2txt.o $(LIBGSM) $(LDLIB)
++
++$(TST)/lin2cod:		$(TST)/lin2cod.o $(LIBGSM)
++			$(LD) $(LFLAGS) -o $(TST)/lin2cod \
++				$(TST)/lin2cod.o $(LIBGSM) $(LDLIB)
++
++$(TST)/gsm2cod:		$(TST)/gsm2cod.o $(LIBGSM)
++			$(LD) $(LFLAGS) -o $(TST)/gsm2cod \
++				$(TST)/gsm2cod.o $(LIBGSM) $(LDLIB)
++
++$(TST)/cod2txt:		$(TST)/cod2txt.o $(LIBGSM)
++			$(LD) $(LFLAGS) -o $(TST)/cod2txt \
++				$(TST)/cod2txt.o $(LIBGSM) $(LDLIB)
++
++$(TST)/cod2lin:		$(TST)/cod2lin.o $(LIBGSM)
++			$(LD) $(LFLAGS) -o $(TST)/cod2lin \
++				$(TST)/cod2lin.o $(LIBGSM) $(LDLIB)
diff --git a/gsm/mingw-w64/win32.patch b/gsm/mingw-w64/win32.patch
new file mode 100644
index 00000000..6190c349
--- /dev/null
+++ b/gsm/mingw-w64/win32.patch
@@ -0,0 +1,20 @@
+diff -ru gsm-1.0-pl13/inc/config.h patched/inc/config.h
+--- gsm-1.0-pl13/inc/config.h	2006-04-26 21:14:26.000000000 +0200
++++ patched/inc/config.h	2013-06-14 17:20:37.435375581 +0200
+@@ -17,12 +17,16 @@
+ #define	HAS_FCNTL_H	1		/* /usr/include/fcntl.h		*/
+ #define	HAS_ERRNO_DECL	1		/* errno.h declares errno	*/
+ 
++#ifdef __WIN32
++
++#else
+ #define	HAS_FSTAT 	1		/* fstat syscall		*/
+ #define	HAS_FCHMOD 	1		/* fchmod syscall		*/
+ #define	HAS_CHMOD 	1		/* chmod syscall		*/
+ #define	HAS_FCHOWN 	1		/* fchown syscall		*/
+ #define	HAS_CHOWN 	1		/* chown syscall		*/
+ /*efine	HAS__FSETMODE 	1		/* _fsetmode -- set file mode	*/
++#endif
+ 
+ #define	HAS_STRING_H 	1		/* /usr/include/string.h 	*/
+ /*efine	HAS_STRINGS_H	1		/* /usr/include/strings.h 	*/
diff --git a/isoviewer/default/PKGBUILD b/isoviewer/default/PKGBUILD
index 73afc354..7a3b437a 100644
--- a/isoviewer/default/PKGBUILD
+++ b/isoviewer/default/PKGBUILD
@@ -19,11 +19,11 @@ md5sums=('a80b0b052bf4db529d9342da9a950b3f'
          'dddc76d48a27c97823c3f95131772a01')
 
 package() {
-    cd $srcdir
-    # start script
-    install -m755 -D "./${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    # jar file
-    install -m644 -D "./$pkgname-$pkgver.jar" "${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar"
-    # menu entry
-    install -m644 -D "./${pkgname}.desktop" "$pkgdir/usr/share/applications/${pkgname}.desktop"
+  cd $srcdir
+  # start script
+  install -m755 -D "./${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+  # jar file
+  install -m644 -D "./$pkgname-$pkgver.jar" "${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar"
+  # menu entry
+  install -m644 -D "./${pkgname}.desktop" "$pkgdir/usr/share/applications/${pkgname}.desktop"
 }
diff --git a/isoviewer/default/isoviewer.install b/isoviewer/default/isoviewer.install
index 71d138f2..a2930a4f 100644
--- a/isoviewer/default/isoviewer.install
+++ b/isoviewer/default/isoviewer.install
@@ -1,11 +1,11 @@
 post_install() {
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_upgrade() {
-    post_install
+  post_install
 }
 
 post_remove() {
-    post_install
+  post_install
 }
diff --git a/jflap/default/PKGBUILD b/jflap/default/PKGBUILD
index cd37ae70..3af93822 100644
--- a/jflap/default/PKGBUILD
+++ b/jflap/default/PKGBUILD
@@ -11,6 +11,8 @@ depends=('java-environment')
 _file=${pkgname^^}.jar
 source=("http://www.cs.duke.edu/csed/jflap/jflaptmp/may15-2011/withoutSource/$_file"
         "$pkgname.sh")
+md5sums=('95d5f8f9f098331f6f61c24f7931589f'
+         'c5e9c07d641f0a28a65e575feff9ec60')
 
 package() {
   cd $srcdir
@@ -20,5 +22,3 @@ package() {
   cp $pkgname.sh $pkgdir/usr/bin/$pkgname
   chmod +x $pkgdir/usr/bin/$pkgname
 }
-md5sums=('95d5f8f9f098331f6f61c24f7931589f'
-         'c5e9c07d641f0a28a65e575feff9ec60')
diff --git a/libssh/mingw-w64/PKGBUILD b/libssh/mingw-w64/PKGBUILD
new file mode 100644
index 00000000..4e1057b9
--- /dev/null
+++ b/libssh/mingw-w64/PKGBUILD
@@ -0,0 +1,76 @@
+# Maintainer: Karl-Felix Glatzer <karl.glatzer@gmx.de>
+# Contributor: Tom Gundersen <teg@jklm.no>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: ice-man <icemanf@gmail.com>
+# Contributor: sergeantspoon <sergeantspoon@archlinux.us>
+# Contributor: Alexey Pavlov <alexpux@gmail.com>
+
+pkgname=mingw-w64-libssh
+pkgver=0.7.2
+pkgrel=2
+pkgdesc="Library for accessing ssh client services through C libraries (mingw-w64)"
+url="http://www.libssh.org/"
+license=('LGPL')
+arch=('any')
+depends=('mingw-w64-openssl')
+makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-pkg-config' 'doxygen')
+options=(!strip !buildflags staticlibs)
+#cmocka
+#checkdepends=('openssh')
+source=(https://red.libssh.org/attachments/download/177/libssh-${pkgver}.tar.xz
+        https://red.libssh.org/attachments/download/168/libssh-${pkgver}.tar.asc
+        mingw-as-unix.patch
+        mingw-DATADIR-conflict.patch
+        mingw-pkgconfig.patch
+        fix_check_include_files.patch)
+md5sums=('5d7d468937649a6dfc6186edfff083db'
+         'SKIP'
+         'fc03637960f420837ad506892b444986'
+         '7be13e00d27ce77f862012ee0654019b'
+         '500031299c94117c62526601ec966f1e'
+         'd608bd0626ef16ca7f1ac2446e8f411c')
+validpgpkeys=('8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider <asn@cryptomilk.org>
+_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+
+prepare() {
+  # disable the test. It is confused by our clean container setup.
+  # 'extra-x86-build' uses user 'nobody' that has a record in /etc/passwd file
+  # but $HOME envvar is set to '/build'. The test expects that $HOME corresponds to passwd file.
+  sed 's/unit_test(torture_path_expand_tilde_unix),//' -i libssh-${pkgver}/tests/unittests/torture_misc.c
+
+  cd "${srcdir}/libssh-${pkgver}"
+
+  patch -p1 -i ${srcdir}/mingw-as-unix.patch
+  patch -p1 -i ${srcdir}/mingw-DATADIR-conflict.patch
+  patch -p1 -i ${srcdir}/mingw-pkgconfig.patch
+  patch -p1 -i ${srcdir}/fix_check_include_files.patch
+}
+
+build() {
+  for _arch in ${_architectures}; do
+    mkdir -p "${srcdir}"/build-${_arch} && cd "${srcdir}"/build-${_arch}
+
+    ${_arch}-cmake ../libssh-${pkgver} \
+      -DCMAKE_INSTALL_PREFIX=/usr/${_arch} \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DWITH_GSSAPI=OFF \
+      -DWITH_STATIC_LIB=ON
+
+      #-DWITH_TESTING=ON
+    make
+  done
+}
+
+#TODO: Test with wine?
+#check() {
+#  cd build
+#  make test
+#}
+
+package(){
+  for _arch in ${_architectures}; do
+    cd "${srcdir}"/build-${_arch}
+
+    make DESTDIR="${pkgdir}" install
+  done
+}
diff --git a/libssh/mingw-w64/fix_check_include_files.patch b/libssh/mingw-w64/fix_check_include_files.patch
new file mode 100644
index 00000000..a445855f
--- /dev/null
+++ b/libssh/mingw-w64/fix_check_include_files.patch
@@ -0,0 +1,8 @@
+--- libssh-0.7.2/ConfigureChecks.cmake	2015-12-26 00:41:50.000000000 +0100
++++ patched/ConfigureChecks.cmake	2015-12-26 00:49:18.862060811 +0100
+@@ -1,4 +1,5 @@
+ include(CheckIncludeFile)
++include(CheckIncludeFiles)
+ include(CheckSymbolExists)
+ include(CheckFunctionExists)
+ include(CheckLibraryExists)
diff --git a/libssh/mingw-w64/mingw-DATADIR-conflict.patch b/libssh/mingw-w64/mingw-DATADIR-conflict.patch
new file mode 100644
index 00000000..ee3ce8ef
--- /dev/null
+++ b/libssh/mingw-w64/mingw-DATADIR-conflict.patch
@@ -0,0 +1,24 @@
+diff -Naur libssh-0.6.4-orig/config.h.cmake libssh-0.6.4/config.h.cmake
+--- libssh-0.6.4-orig/config.h.cmake	2014-12-19 11:11:17.000000000 +0300
++++ libssh-0.6.4/config.h.cmake	2014-12-25 14:10:49.834000000 +0300
+@@ -5,7 +5,7 @@
+ #cmakedefine VERSION "${APPLICATION_VERSION}"
+ 
+ #cmakedefine LOCALEDIR "${LOCALE_INSTALL_DIR}"
+-#cmakedefine DATADIR "${DATADIR}"
++#cmakedefine DATA_DIR "${DATA_DIR}"
+ #cmakedefine LIBDIR "${LIBDIR}"
+ #cmakedefine PLUGINDIR "${PLUGINDIR}"
+ #cmakedefine SYSCONFDIR "${SYSCONFDIR}"
+diff -Naur libssh-0.6.4-orig/ConfigureChecks.cmake libssh-0.6.4/ConfigureChecks.cmake
+--- libssh-0.6.4-orig/ConfigureChecks.cmake	2014-12-19 11:11:17.000000000 +0300
++++ libssh-0.6.4/ConfigureChecks.cmake	2014-12-25 14:11:05.297000000 +0300
+@@ -8,7 +8,7 @@
+ 
+ set(PACKAGE ${APPLICATION_NAME})
+ set(VERSION ${APPLICATION_VERSION})
+-set(DATADIR ${DATA_INSTALL_DIR})
++set(DATA_DIR ${DATA_INSTALL_DIR})
+ set(LIBDIR ${LIB_INSTALL_DIR})
+ set(PLUGINDIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")
+ set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
diff --git a/libssh/mingw-w64/mingw-as-unix.patch b/libssh/mingw-w64/mingw-as-unix.patch
new file mode 100644
index 00000000..169c6b36
--- /dev/null
+++ b/libssh/mingw-w64/mingw-as-unix.patch
@@ -0,0 +1,47 @@
+diff -Naur libssh-0.6.4-orig/cmake/Modules/DefineInstallationPaths.cmake libssh-0.6.4/cmake/Modules/DefineInstallationPaths.cmake
+--- libssh-0.6.4-orig/cmake/Modules/DefineInstallationPaths.cmake	2014-09-15 22:54:34.000000000 +0400
++++ libssh-0.6.4/cmake/Modules/DefineInstallationPaths.cmake	2014-12-25 12:45:52.735000000 +0300
+@@ -1,4 +1,4 @@
+-if (UNIX OR OS2)
++if (UNIX OR OS2 OR MINGW)
+   IF (NOT APPLICATION_NAME)
+     MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME")
+     SET(APPLICATION_NAME ${PROJECT_NAME})
+diff -Naur libssh-0.6.4-orig/libssh.pc.cmake libssh-0.6.4/libssh.pc.cmake
+--- libssh-0.6.4-orig/libssh.pc.cmake	2013-02-07 22:23:14.000000000 +0400
++++ libssh-0.6.4/libssh.pc.cmake	2014-12-25 12:44:04.023000000 +0300
+@@ -1,6 +1,11 @@
+-Name: ${APPLICATION_NAME}
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}/bin
++libdir=@LIB_INSTALL_DIR@
++includedir=@INCLUDE_INSTALL_DIR@
++
++Name: @APPLICATION_NAME@
+ Description: The SSH Library
+-Version: ${APPLICATION_VERSION}
+-Libs: -L${LIB_INSTALL_DIR} -lssh
+-Cflags: -I${INCLUDE_INSTALL_DIR}
++Version: @APPLICATION_VERSION@
++Libs: -L${libdir} -lssh
++Cflags: -I${includedir}
+ 
+diff -Naur libssh-0.6.4-orig/libssh_threads.pc.cmake libssh-0.6.4/libssh_threads.pc.cmake
+--- libssh-0.6.4-orig/libssh_threads.pc.cmake	2014-09-15 22:54:34.000000000 +0400
++++ libssh-0.6.4/libssh_threads.pc.cmake	2014-12-25 12:43:12.932000000 +0300
+@@ -1,6 +1,11 @@
+-Name: ${APPLICATION_NAME}_threads
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}/bin
++libdir=@LIB_INSTALL_DIR@
++includedir=@INCLUDE_INSTALL_DIR@
++
++Name: @APPLICATION_NAME@_threads
+ Description: The SSH Library Thread Extension
+-Version: ${APPLICATION_VERSION}
+-Libs: -L${LIB_INSTALL_DIR} -lssh_threads
+-Cflags: -I${INCLUDE_INSTALL_DIR}
++Version: @APPLICATION_VERSION@
++Libs: -L${libdir} -lssh_threads
++Cflags: -I${includedir}
+ 
diff --git a/libssh/mingw-w64/mingw-pkgconfig.patch b/libssh/mingw-w64/mingw-pkgconfig.patch
new file mode 100644
index 00000000..563d6de5
--- /dev/null
+++ b/libssh/mingw-w64/mingw-pkgconfig.patch
@@ -0,0 +1,21 @@
+diff -ru libssh-0.7.2/CMakeLists.txt patched/CMakeLists.txt
+--- libssh-0.7.2/CMakeLists.txt	2015-09-16 08:44:35.000000000 +0200
++++ patched/CMakeLists.txt	2015-11-12 16:00:58.999198281 +0100
+@@ -84,7 +84,7 @@
+ add_subdirectory(src)
+ 
+ # pkg-config file
+-if (UNIX)
++if (UNIX OR MINGW)
+ configure_file(libssh.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc)
+ install(
+   FILES
+@@ -108,7 +108,7 @@
+             pkgconfig
+         )
+     endif (LIBSSH_THREADS)
+-endif (UNIX)
++endif (UNIX OR MINGW)
+ 
+ # cmake config files
+ set(LIBSSH_LIBRARY_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}ssh${CMAKE_SHARED_LIBRARY_SUFFIX})
diff --git a/mediaplayerctl/default/PKGBUILD b/mediaplayerctl/default/PKGBUILD
index c78cbf71..b2cf1947 100755
--- a/mediaplayerctl/default/PKGBUILD
+++ b/mediaplayerctl/default/PKGBUILD
@@ -18,5 +18,5 @@ noextract=
 sha256sums=('SKIP')
 
 package() {
-    install -Dm755 "${srcdir}/${PROJECT_DIR_NAME:-$pkgname-$pkgver}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm755 "${srcdir}/${PROJECT_DIR_NAME:-$pkgname-$pkgver}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
 }
diff --git a/mkvtoolnix/git/PKGBUILD b/mkvtoolnix/git/PKGBUILD
index 4bba74e6..5b6f5c69 100644
--- a/mkvtoolnix/git/PKGBUILD
+++ b/mkvtoolnix/git/PKGBUILD
@@ -16,8 +16,8 @@ md5sums=('SKIP')
 install=mkvtoolnix.install
 
 pkgver() {
-    cd "${srcdir}/${pkgname}"
-    echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  cd "${srcdir}/${pkgname}"
+  echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 prepare() {
diff --git a/mkvtoolnix/git/mkvtoolnix.install b/mkvtoolnix/git/mkvtoolnix.install
index 14813516..01ac03c3 100644
--- a/mkvtoolnix/git/mkvtoolnix.install
+++ b/mkvtoolnix/git/mkvtoolnix.install
@@ -1,15 +1,15 @@
 post_install() {
-   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-   if [ -f usr/bin/update-mime-database ]; then
-      update-mime-database usr/share/mime &> /dev/null
-   fi
-   update-desktop-database -q
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  if [ -f usr/bin/update-mime-database ]; then
+    update-mime-database usr/share/mime &> /dev/null
+  fi
+  update-desktop-database -q
 }
 
 post_upgrade() {
-   post_install
+  post_install
 }
 
 pre_remove() {
-   post_install
+  post_install
 }
diff --git a/passwordfile/default/PKGBUILD b/passwordfile/default/PKGBUILD
index f07e780b..01c56073 100644
--- a/passwordfile/default/PKGBUILD
+++ b/passwordfile/default/PKGBUILD
@@ -1,25 +1,25 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _reponame=passwordfile
 pkgname=passwordfile
-pkgver=3.0.1
+pkgver=3.1.0
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="C++ library to read/write passwords from/to encrypted files (using AES-256-CBC via OpenSSL)."
 license=('GPL')
 depends=('c++utilities' 'openssl')
-makedepends=('qt5-base')
+makedepends=('cmake')
 install=
 url="https://github.com/Martchus/${_reponame}"
 source=("passwordfile-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('959176b21b45c8435c7c87d501c263dc4d8088e861b8659294448f6c77768ebb')
+sha256sums=('b52beffef5a7c941ae4fc5dc6d1dc62cb12839eabbb5ea39c59c3fb6497b025a')
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro"
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  make
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
diff --git a/passwordfile/git/PKGBUILD b/passwordfile/git/PKGBUILD
index 25ae90c6..3661a0c4 100644
--- a/passwordfile/git/PKGBUILD
+++ b/passwordfile/git/PKGBUILD
@@ -3,12 +3,12 @@ _name=passwordfile
 _reponame=passwordfile
 pkgname=passwordfile-git
 pkgver=20.bcefbb6
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 pkgdesc="C++ library to read/write passwords from/to encrypted files (using AES-256-CBC via OpenSSL, git version)."
 license=('GPL')
 depends=('c++utilities' 'openssl')
-makedepends=('qt5-base' 'git')
+makedepends=('cmake' 'git')
 provides=('passwordfile')
 conflicts=('passwordfile')
 install=
@@ -17,17 +17,17 @@ source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}/${pkgname}"
-    echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  cd "${srcdir}/${pkgname}"
+  echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 build() {
-    cd "${srcdir}/${pkgname}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$_name.pro"
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
diff --git a/passwordfile/mingw-w64/PKGBUILD b/passwordfile/mingw-w64/PKGBUILD
index 4a99f485..56257d3c 100644
--- a/passwordfile/mingw-w64/PKGBUILD
+++ b/passwordfile/mingw-w64/PKGBUILD
@@ -2,35 +2,35 @@
 _name=passwordfile
 _reponame=passwordfile
 pkgname=mingw-w64-passwordfile
-pkgver=3.0.1
+pkgver=3.1.0
 pkgrel=1
 arch=('any')
 pkgdesc="C++ library to read/write passwords from/to encrypted files (using AES-256-CBC via OpenSSL, mingw-w64)."
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-c++utilities' 'mingw-w64-openssl')
-makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-base')
+makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
 url="https://github.com/Martchus/${_reponame}"
 source=("passwordfile-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('SKIP')
-options=('staticlibs' '!strip')
+sha256sums=('b52beffef5a7c941ae4fc5dc6d1dc62cb12839eabbb5ea39c59c3fb6497b025a')
+options=(!buildflags staticlibs !strip !emptydirs)
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    # build for each architecture
-    for _arch in ${_architectures}; do
-        mkdir -p build-${_arch} && pushd build-${_arch}
-        INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-dll CONFIG+=mingw-w64-noversion
-        make
-        popd
-    done
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  # build utilities for each architecture
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/${_arch}" ../
+    make
+    popd
+  done
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    for _arch in ${_architectures}; do
-        pushd build-${_arch}
-        make install
-        popd
-    done
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  for _arch in ${_architectures}; do
+    pushd build-${_arch}
+    make install-mingw-w64-strip
+    popd
+  done
 }
diff --git a/passwordmanager/default/PKGBUILD b/passwordmanager/default/PKGBUILD
index 3220adb3..3db1cafe 100644
--- a/passwordmanager/default/PKGBUILD
+++ b/passwordmanager/default/PKGBUILD
@@ -1,25 +1,25 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _reponame=passwordmanager
 pkgname=passwordmanager
-pkgver=2.0.9
+pkgver=2.1.0
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="A simple password store using AES-256-CBC encryption via OpenSSL."
 license=('GPL')
 depends=('qt5-base' 'qtutilities' 'passwordfile' 'openssl' 'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils')
-makedepends=('qt5-tools')
+makedepends=('cmake' 'qt5-tools')
 install=${pkgname}.install
 url="https://github.com/Martchus/${_reponame}"
 source=("passwordmanager-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('a6086f9dd394064368dd0098f01be163bccd6aa00e7c093f5a2cbf1b5951c176')
+sha256sums=('85b436cf43d1bc9cd83ef1f756d85870b3c066aa1103ef290a364ed0c642e907')
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro"
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  make
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
diff --git a/passwordmanager/default/passwordmanager.install b/passwordmanager/default/passwordmanager.install
index 5495fb1b..5c501dc4 100644
--- a/passwordmanager/default/passwordmanager.install
+++ b/passwordmanager/default/passwordmanager.install
@@ -1,12 +1,12 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-desktop-database -q
 }
 
 post_upgrade() {
-    post_install
+  post_install
 }
 
 post_remove() {
-    post_install
+  post_install
 }
diff --git a/passwordmanager/git/PKGBUILD b/passwordmanager/git/PKGBUILD
index bdfc43b0..364be30f 100644
--- a/passwordmanager/git/PKGBUILD
+++ b/passwordmanager/git/PKGBUILD
@@ -3,12 +3,12 @@ _name=passwordmanager
 _reponame=passwordmanager
 pkgname=passwordmanager-git
 pkgver=36.90d37ae
-pkgrel=9
+pkgrel=10
 arch=('i686' 'x86_64')
 pkgdesc="A simple password store using AES-256-CBC encryption via OpenSSL (git version)."
 license=('GPL')
 depends=('qt5-base' 'qtutilities' 'passwordfile' 'openssl' 'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils')
-makedepends=('qt5-tools' 'git')
+makedepends=('cmake' 'qt5-tools' 'git')
 provides=('passwordmanager')
 conflicts=('passwordmanager')
 install=${_name}.install
@@ -17,17 +17,17 @@ source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}/${pkgname}"
-    echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  cd "${srcdir}/${pkgname}"
+  echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 build() {
-    cd "${srcdir}/${pkgname}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$_name.pro"
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
diff --git a/passwordmanager/git/passwordmanager.install b/passwordmanager/git/passwordmanager.install
index 5495fb1b..5c501dc4 100644
--- a/passwordmanager/git/passwordmanager.install
+++ b/passwordmanager/git/passwordmanager.install
@@ -1,12 +1,12 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-desktop-database -q
 }
 
 post_upgrade() {
-    post_install
+  post_install
 }
 
 post_remove() {
-    post_install
+  post_install
 }
diff --git a/passwordmanager/mingw-w64/PKGBUILD b/passwordmanager/mingw-w64/PKGBUILD
index 017a7da0..0b895822 100644
--- a/passwordmanager/mingw-w64/PKGBUILD
+++ b/passwordmanager/mingw-w64/PKGBUILD
@@ -2,34 +2,35 @@
 _name=passwordmanager
 _reponame=passwordmanager
 pkgname=mingw-w64-passwordmanager
-pkgver=2.0.9
+pkgver=2.1.0
 pkgrel=1
 arch=('any')
 pkgdesc="A simple password store using AES-256-CBC encryption via OpenSSL (mingw-w64)."
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-qtutilities' 'mingw-w64-passwordfile' 'mingw-w64-openssl')
-makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-tools' 'ffmpeg')
+makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg')
 url="https://github.com/Martchus/${_reponame}"
 source=("passwordmanager-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('SKIP')
+sha256sums=('85b436cf43d1bc9cd83ef1f756d85870b3c066aa1103ef290a364ed0c642e907')
+options=(!buildflags staticlibs !strip !emptydirs)
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    # build for each architecture
-    for _arch in ${_architectures}; do
-        mkdir -p build-${_arch} && pushd build-${_arch}
-        INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-exe
-        make -j 1
-        popd
-    done
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  # build utilities for each architecture
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/${_arch}" ../
+    make
+    popd
+  done
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    for _arch in ${_architectures}; do
-        pushd build-${_arch}
-        make install
-        popd  
-    done
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  for _arch in ${_architectures}; do
+    pushd build-${_arch}
+    make install-mingw-w64-strip
+    popd
+  done
 }
diff --git a/pkgbuilds.pro b/pkgbuilds.pro
index 8a53cc60..904b2271 100644
--- a/pkgbuilds.pro
+++ b/pkgbuilds.pro
@@ -28,12 +28,6 @@ OTHER_FILES += \
     tagparser/default/PKGBUILD \
     tagparser/git/PKGBUILD \
     tagparser/mingw-w64/PKGBUILD \
-    tasky-client/default/PKGBUILD \
-    tasky-client/mingw-w64/PKGBUILD \
-    tasky-lib/default/PKGBUILD \
-    tasky-lib/mingw-w64/PKGBUILD \
-    tasky-server/default/PKGBUILD \
-    tasky-server/mingw-w64/PKGBUILD \
     videodownloader/default/PKGBUILD \
     videodownloader/default/videodownloader.install \
     videodownloader/git/PKGBUILD \
@@ -71,4 +65,16 @@ OTHER_FILES += \
     freetype2/mingw-w64-bootstrap/0001-Enable-table-validation-modules.patch \
     freetype2/mingw-w64-bootstrap/0002-Enable-subpixel-rendering.patch \
     freetype2/mingw-w64-bootstrap/0003-Enable-subpixel-hinting.patch \
-    freetype2/mingw-w64-bootstrap/0004-Mask-subpixel-hinting-with-an-env-var.patch
+    freetype2/mingw-w64-bootstrap/0004-Mask-subpixel-hinting-with-an-env-var.patch \
+    evince/mingw-w64/PKGBUILD \
+    evince/mingw-w64/0002-missing-include.patch \
+    geany/mingw-w64/PKGBUILD \
+    gsm/mingw-w64/PKGBUILD \
+    gsm/mingw-w64/gsm.patch \
+    gsm/mingw-w64/makefile.patch \
+    gsm/mingw-w64/win32.patch \
+    libssh/mingw-w64/PKGBUILD \
+    libssh/mingw-w64/fix_check_include_files.patch \
+    libssh/mingw-w64/mingw-as-unix.patch \
+    libssh/mingw-w64/mingw-DATADIR-conflict.patch \
+    libssh/mingw-w64/mingw-pkgconfig.patch
diff --git a/python-pyusb/default/PKGBUILD b/python-pyusb/default/PKGBUILD
index 653c65e7..43141845 100644
--- a/python-pyusb/default/PKGBUILD
+++ b/python-pyusb/default/PKGBUILD
@@ -14,12 +14,12 @@ source=("https://github.com/walac/pyusb/archive/${pkgver}.tar.gz")
 md5sums=('bc12e83ff3ef1045d4306d13a9955fc1')
 
 build() {
-	cd $srcdir/pyusb-$pkgver
-	python setup.py build
+  cd $srcdir/pyusb-$pkgver
+  python setup.py build
 }
 
 package() {
-	cd $srcdir/pyusb-$pkgver
-	python setup.py install -f --root="$pkgdir"
-	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  cd $srcdir/pyusb-$pkgver
+  python setup.py install -f --root="$pkgdir"
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/qtutilities/default/PKGBUILD b/qtutilities/default/PKGBUILD
index d680d65d..797ae9b9 100644
--- a/qtutilities/default/PKGBUILD
+++ b/qtutilities/default/PKGBUILD
@@ -1,26 +1,25 @@
 # Maintainer: Martchus <martchus@gmx.net>
+_reponame=qtutilities
 pkgname=qtutilities
-pkgver=3.0.1
+pkgver=3.1.0
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="Common Qt related C++ classes and routines used by my
- applications such as dialogs, widgets and models."
+pkgdesc="Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models."
 license=('GPL')
 depends=('c++utilities' 'qt5-base')
-makedepends=
-url="https://github.com/Martchus/${pkgname}"
-source=("qtutilities-${pkgver}.tar.gz::https://github.com/Martchus/${pkgname}/archive/v${pkgver}.tar.gz")
-_reponame=qtutilities
-sha256sums=('01f176f139be5bc2bb136428c497a1b491611e51c480d0fb261ae0536a270236')
+makedepends=('cmake')
+url="https://github.com/Martchus/${_reponame}"
+source=("qtutilities-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('e2c9816aa82ea98004437503b52b4b64cec56fc7fd4bd2a649d998a2d1a2cf8d')
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro"
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  make
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
 
diff --git a/qtutilities/git/PKGBUILD b/qtutilities/git/PKGBUILD
index e7bf0524..a26f52f8 100644
--- a/qtutilities/git/PKGBUILD
+++ b/qtutilities/git/PKGBUILD
@@ -3,13 +3,12 @@ _name=qtutilities
 _reponame=qtutilities
 pkgname=qtutilities-git
 pkgver=35.721e79d
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
-pkgdesc="Common Qt related C++ classes and routines used by my
- applications such as dialogs, widgets and models (git version)."
+pkgdesc="Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (git version)."
 license=('GPL')
 depends=('c++utilities' 'qt5-base')
-makedepends=('git')
+makedepends=('cmake' 'git')
 provides=('qtutilities')
 conflicts=('qtutilities')
 url="https://github.com/Martchus/${_reponame}"
@@ -17,18 +16,18 @@ source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}/${pkgname}"
-    echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  cd "${srcdir}/${pkgname}"
+  echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 build() {
-    cd "${srcdir}/${pkgname}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$_name.pro"
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
 
diff --git a/qtutilities/mingw-w64/PKGBUILD b/qtutilities/mingw-w64/PKGBUILD
index 5101b090..97ddc72f 100644
--- a/qtutilities/mingw-w64/PKGBUILD
+++ b/qtutilities/mingw-w64/PKGBUILD
@@ -2,36 +2,35 @@
 _name=qtutilities
 _reponame=qtutilities
 pkgname=mingw-w64-qtutilities
-pkgver=3.0.1
+pkgver=3.1.0
 pkgrel=1
 arch=('any')
-pkgdesc="Common Qt related C++ classes and routines used by my
- applications such as dialogs, widgets and models. (mingw-w64)."
+pkgdesc="Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models. (mingw-w64)."
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-c++utilities')
-makedepends=('mingw-w64-gcc')
+makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
 url="https://github.com/Martchus/${_reponame}"
 source=("qtutilities-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
 sha256sums=('01f176f139be5bc2bb136428c497a1b491611e51c480d0fb261ae0536a270236')
-options=('staticlibs' '!strip')
+options=(!buildflags staticlibs !strip !emptydirs)
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    # build utilities for each architecture
-    for _arch in ${_architectures}; do
-        mkdir -p build-${_arch} && pushd build-${_arch}
-        INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-dll CONFIG+=mingw-w64-noversion
-        make
-        popd
-    done
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  # build utilities for each architecture
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/${_arch}" ../
+    make
+    popd
+  done
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    for _arch in ${_architectures}; do       
-        pushd build-${_arch}
-        make install
-        popd             
-    done
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  for _arch in ${_architectures}; do
+    pushd build-${_arch}
+    make install-mingw-w64-strip
+    popd
+  done
 }
diff --git a/repoindex/default/PKGBUILD b/repoindex/default/PKGBUILD
index b40d87e8..eb560c2f 100644
--- a/repoindex/default/PKGBUILD
+++ b/repoindex/default/PKGBUILD
@@ -10,17 +10,16 @@ depends=('qt5-base' 'qt5-network' 'pacman' 'c++utilities')
 makedepends=
 url="https://github.com/Martchus/${_reponame}"
 source=("repoindex-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-_reponame=repoindex
 sha256sums=('SKIP')
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" -r -spec linux-g++
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" -r -spec linux-g++
+  make
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
 
diff --git a/repoindex/git/PKGBUILD b/repoindex/git/PKGBUILD
index b910d5a7..ff7a4124 100644
--- a/repoindex/git/PKGBUILD
+++ b/repoindex/git/PKGBUILD
@@ -13,18 +13,18 @@ source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}/${pkgname}"
-    echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  cd "${srcdir}/${pkgname}"
+  echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 build() {
-    cd "${srcdir}/${pkgname}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" -r -spec linux-g++
-    make
+  cd "${srcdir}/${pkgname}"
+  INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" -r -spec linux-g++
+  make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}"
-    make install
+  cd "${srcdir}/${pkgname}"
+  make install
 }
 
diff --git a/subtitlecomposer/default/PKGBUILD b/subtitlecomposer/default/PKGBUILD
index aa7d28ec..d76ed272 100644
--- a/subtitlecomposer/default/PKGBUILD
+++ b/subtitlecomposer/default/PKGBUILD
@@ -17,24 +17,22 @@ license=('GPL')
 depends=('kdelibs' 'gettext')
 makedepends=('cmake' 'automoc4' 'git')
 conflicts=('subtitlecomposer-git')
-optdepends=(
-    'mplayer: for MPlayer backend'
-    'mplayer2: for MPlayer backend'
-    'gstreamer: for GStreamer backend'
-    'xine-lib: for Xine backend'
-    )
+optdepends=('mplayer: for MPlayer backend'
+            'mplayer2: for MPlayer backend'
+            'gstreamer: for GStreamer backend'
+            'xine-lib: for Xine backend')
 source=("https://github.com/maxrd2/subtitlecomposer/archive/v${pkgver}.tar.gz")
 md5sums=('9e1fef4dca5a15e5c0435f1b099d4ab4')
 
 build() {
-    cd ${srcdir}/subtitlecomposer-${pkgver}
-    cmake -DCMAKE_INSTALL_PREFIX=/usr
-    # workaround for "gst/gstconfig.h: No such file or directory"
-    export CPATH=/usr/lib/gstreamer-1.0/include
-    make
+  cd ${srcdir}/subtitlecomposer-${pkgver}
+  cmake -DCMAKE_INSTALL_PREFIX=/usr
+  # workaround for "gst/gstconfig.h: No such file or directory"
+  export CPATH=/usr/lib/gstreamer-1.0/include
+  make
 }
 
 package() {
-    cd ${srcdir}/subtitlecomposer-${pkgver}
-    make DESTDIR=${pkgdir} install
+  cd ${srcdir}/subtitlecomposer-${pkgver}
+  make DESTDIR=${pkgdir} install
 } 
diff --git a/subtitlecomposer/git/PKGBUILD b/subtitlecomposer/git/PKGBUILD
index b06332c2..02c82f5f 100644
--- a/subtitlecomposer/git/PKGBUILD
+++ b/subtitlecomposer/git/PKGBUILD
@@ -18,29 +18,27 @@ depends=('kdelibs' 'gettext')
 makedepends=('cmake' 'automoc4' 'git')
 conflicts=('subtitlecomposer')
 install=('subtitlecomposer.install')
-optdepends=(
-        'mpv: for MPV backend'
-        'mplayer: for MPlayer backend'
-        'mplayer2: for MPlayer backend'
-        'gstreamer: for GStreamer backend'
-        'xine-lib: for Xine backend'
-        )
+optdepends=('mpv: for MPV backend'
+            'mplayer: for MPlayer backend'
+            'mplayer2: for MPlayer backend'
+            'gstreamer: for GStreamer backend'
+            'xine-lib: for Xine backend')
 source=('git+file:///home/max/projects/SubtitleComposer')
 md5sums=('SKIP')
 
 pkgver() {
-        export APP_VER=${pkgver}
-        cd ${srcdir}/SubtitleComposer
-        git describe --always | sed 's|-|.|g'
+  export APP_VER=${pkgver}
+  cd ${srcdir}/SubtitleComposer
+  git describe --always | sed 's|-|.|g'
 }
 
 build() {
-        cd ${srcdir}/SubtitleComposer
-        cmake -DCMAKE_INSTALL_PREFIX=/usr
-        make
+  cd ${srcdir}/SubtitleComposer
+  cmake -DCMAKE_INSTALL_PREFIX=/usr
+  make
 }
 
 package() {
-        cd ${srcdir}/SubtitleComposer
-        make DESTDIR=${pkgdir} install
+  cd ${srcdir}/SubtitleComposer
+  make DESTDIR=${pkgdir} install
 }
diff --git a/subtitlecomposer/git/subtitlecomposer.install b/subtitlecomposer/git/subtitlecomposer.install
index f98ba733..2eaa6055 100644
--- a/subtitlecomposer/git/subtitlecomposer.install
+++ b/subtitlecomposer/git/subtitlecomposer.install
@@ -1,11 +1,11 @@
 post_install() {
-    update-desktop-database -q
+  update-desktop-database -q
 }
 
 post_upgrade() {
-    post_install $1
+  post_install $1
 }
 
 post_remove() {
-    post_install $1
+  post_install $1
 }
diff --git a/tageditor/default/PKGBUILD b/tageditor/default/PKGBUILD
index 1e48944a..59f77903 100644
--- a/tageditor/default/PKGBUILD
+++ b/tageditor/default/PKGBUILD
@@ -1,32 +1,25 @@
 # Maintainer: Martchus <martchus@gmx.net>
-# decide whether to link against the deprecated Qt WebKit module (in qt5-webkit package ~40 MB) or
-# the newer, chromium-based Qt WebEngine module (in qt5-webengine package ~100 MB)
-_webviewprovider=qt5-webkit
 _reponame=tageditor
 pkgname=tageditor
-pkgver=1.2.1
+pkgver=1.3.0
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="A tag editor with Qt GUI and command-line interface supporting MP4 (iTunes), ID3, Vorbis and Matroska."
 license=('GPL')
-depends=('qt5-script' $_webviewprovider 'qtutilities' 'tagparser' 'desktop-file-utils' 'xdg-utils')
-makedepends=('qt5-tools')
+depends=('qt5-script' 'qt5-webkit' 'qtutilities' 'tagparser' 'desktop-file-utils' 'xdg-utils')
+makedepends=('cmake' 'qt5-tools')
 install=${pkgname}.install
 url="https://github.com/Martchus/${_reponame}"
 source=("tageditor-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('d089b9e66616c39147b639639152c5848f59dafa2c0a9a77d0137fbed13a2af9')
+sha256sums=('6b050fe5281b0be7dba02783e86dfb93c781c8271be949e81371113905db1312')
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    cfg=()
-    if [[ _webviewprovider == qt5-webkit ]]; then
-        cfg+=(forcewebkit)
-    fi
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" $(for val in "${cfg[@]}"; do echo -n "CONFIG+=$val "; done)
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  make
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
diff --git a/tageditor/default/tageditor.install b/tageditor/default/tageditor.install
index 5495fb1b..5c501dc4 100644
--- a/tageditor/default/tageditor.install
+++ b/tageditor/default/tageditor.install
@@ -1,12 +1,12 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-desktop-database -q
 }
 
 post_upgrade() {
-    post_install
+  post_install
 }
 
 post_remove() {
-    post_install
+  post_install
 }
diff --git a/tageditor/git/PKGBUILD b/tageditor/git/PKGBUILD
index f122eb5e..034cd456 100644
--- a/tageditor/git/PKGBUILD
+++ b/tageditor/git/PKGBUILD
@@ -6,36 +6,31 @@ _reponame=tageditor
 _webviewprovider=qt5-webkit
 pkgname=tageditor-git
 pkgver=66.77a0bc2
-pkgrel=11
+pkgrel=12
 arch=('i686' 'x86_64')
 pkgdesc="A tag editor with Qt GUI and command-line interface supporting MP4 (iTunes), ID3, Vorbis and Matroska (git version)."
 license=('GPL')
 depends=('qt5-script' $_webviewprovider 'qtutilities' 'tagparser' 'desktop-file-utils' 'xdg-utils')
-makedepends=('qt5-tools' 'git')
+makedepends=('cmake' 'qt5-tools' 'git')
 provides=('tageditor')
 conflicts=('tageditor')
 install=${_name}.install
 url="https://github.com/Martchus/${_reponame}"
 source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
-
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}/${pkgname}"
-    echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  cd "${srcdir}/${pkgname}"
+  echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 build() {
-    cd "${srcdir}/${pkgname}"
-    cfg=()
-    if [[ _webviewprovider == qt5-webkit ]]; then
-        cfg+=(forcewebkit)
-    fi
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$_name.pro" $(for val in "${cfg[@]}"; do echo -n "CONFIG+=$val "; done)
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
diff --git a/tageditor/git/tageditor.install b/tageditor/git/tageditor.install
index 5495fb1b..5c501dc4 100644
--- a/tageditor/git/tageditor.install
+++ b/tageditor/git/tageditor.install
@@ -1,12 +1,12 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-desktop-database -q
 }
 
 post_upgrade() {
-    post_install
+  post_install
 }
 
 post_remove() {
-    post_install
+  post_install
 }
diff --git a/tageditor/mingw-w64/PKGBUILD b/tageditor/mingw-w64/PKGBUILD
index 3c935aa1..155b4f80 100644
--- a/tageditor/mingw-w64/PKGBUILD
+++ b/tageditor/mingw-w64/PKGBUILD
@@ -1,42 +1,36 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _name=tageditor
 _reponame=tageditor
-# decide whether to link against the deprecated Qt WebKit module (qt5-webkit package ~40 MB) or
-# the newer, chromium-based Qt WebEngine module (qt5-webengine package ~100 MB)
-_webviewprovider=qt5-webkit
 pkgname=mingw-w64-tageditor
-pkgver=1.2.1
+pkgver=1.3.0
 pkgrel=1
 arch=('any')
-pkgdesc="A tageditor with Qt GUI and command line interface supporting MP4 (iTunes), ID3, Vorbis and Matroska."
+pkgdesc="A tageditor with Qt GUI and command line interface supporting MP4 (iTunes), ID3, Vorbis and Matroska (mingw-w64)."
 license=('GPL')
-depends=(mingw-w64-{crt,qt5-script,$_webviewprovider,qtutilities,tagparser})
-makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-tools' 'ffmpeg')
+depends=(mingw-w64-{crt,qt5-script,qt5-webkit,qtutilities,tagparser})
+makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg')
 url="https://github.com/Martchus/${_reponame}"
 source=("tageditor-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('d089b9e66616c39147b639639152c5848f59dafa2c0a9a77d0137fbed13a2af9')
+sha256sums=('6b050fe5281b0be7dba02783e86dfb93c781c8271be949e81371113905db1312')
+options=(!buildflags staticlibs !strip !emptydirs)
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    cfg=(mingw-w64-{install,manualstrip-exe})
-    if [[ _webviewprovider == qt5-webkit ]]; then
-        cfg+=(forcewebkit)
-    fi
-    # build utilities for each architecture
-    for _arch in ${_architectures}; do
-        mkdir -p build-${_arch} && pushd build-${_arch}
-        INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro $(for val in "${cfg[@]}"; do echo -n "CONFIG+=$val "; done)
-        make -j 1
-        popd
-    done
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  # build utilities for each architecture
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/${_arch}" ../
+    make
+    popd
+  done
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    for _arch in ${_architectures}; do
-        pushd build-${_arch}
-        make install
-        popd  
-    done
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  for _arch in ${_architectures}; do
+    pushd build-${_arch}
+    make install-mingw-w64-strip
+    popd
+  done
 }
diff --git a/tagparser/default/PKGBUILD b/tagparser/default/PKGBUILD
index 22b27dc0..bf601eda 100644
--- a/tagparser/default/PKGBUILD
+++ b/tagparser/default/PKGBUILD
@@ -1,24 +1,24 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _reponame=tagparser
 pkgname=tagparser
-pkgver=3.0.1
+pkgver=4.0.0
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="C++ library for reading and writing MP4 (iTunes), ID3, Vorbis and Matroska tags."
 license=('GPL')
-depends=('c++utilities')
-makedepends=('qt5-base')
+depends=('c++utilities' 'zlib')
+makedepends=('cmake')
 url="https://github.com/Martchus/${_reponame}"
 source=("tagparser-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('4b4f029170e934976f7619da3f89ffb34ce173dd6f36f3a9afe4cb1f37802af8')
+sha256sums=('653c48b36c40a4d3229fda87dbacbb493f728d5dc7a2ba85864ba6a1ae7f21a2')
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro"
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  make
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
diff --git a/tagparser/git/PKGBUILD b/tagparser/git/PKGBUILD
index 6fc3f0da..7c51cc05 100644
--- a/tagparser/git/PKGBUILD
+++ b/tagparser/git/PKGBUILD
@@ -3,12 +3,12 @@ _name=tagparser
 _reponame=tagparser
 pkgname=tagparser-git
 pkgver=59.8cc75e1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
-pkgdesc="C++ library for reading and writing MP4 (iTunes), ID3, Vorbis and Matroska tags."
+pkgdesc="C++ library for reading and writing MP4 (iTunes), ID3, Vorbis and Matroska tags (git version)."
 license=('GPL')
-depends=('c++utilities')
-makedepends=('qt5-base' 'git')
+depends=('c++utilities' 'zlib')
+makedepends=('cmake' 'git')
 provides=('videodownloader')
 conflicts=('videodownloader')
 url="https://github.com/Martchus/${_reponame}"
@@ -16,17 +16,17 @@ source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}/${pkgname}"
-    echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  cd "${srcdir}/${pkgname}"
+  echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 build() {
-    cd "${srcdir}/${pkgname}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$_name.pro"
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
diff --git a/tagparser/mingw-w64/PKGBUILD b/tagparser/mingw-w64/PKGBUILD
index 1a2e0229..568120cf 100644
--- a/tagparser/mingw-w64/PKGBUILD
+++ b/tagparser/mingw-w64/PKGBUILD
@@ -2,35 +2,35 @@
 _name=tagparser
 _reponame=tagparser
 pkgname=mingw-w64-tagparser
-pkgver=3.0.1
+pkgver=4.0.0
 pkgrel=1
 arch=('any')
 pkgdesc="C++ library for reading and writing MP4 (iTunes), ID3, Vorbis and Matroska tags (mingw-w64)."
 license=('GPL')
-depends=('mingw-w64-crt' 'mingw-w64-c++utilities')
-makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-base')
+depends=('mingw-w64-crt' 'mingw-w64-c++utilities' 'mingw-w64-zlib')
+makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
 url="https://github.com/Martchus/${_reponame}"
 source=("tagparser-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('4b4f029170e934976f7619da3f89ffb34ce173dd6f36f3a9afe4cb1f37802af8')
-options=('staticlibs' '!strip')
+sha256sums=('653c48b36c40a4d3229fda87dbacbb493f728d5dc7a2ba85864ba6a1ae7f21a2')
+options=(!buildflags staticlibs !strip !emptydirs)
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    # build utilities for each architecture
-    for _arch in ${_architectures}; do
-        mkdir -p build-${_arch} && pushd build-${_arch}
-        INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-dll CONFIG+=mingw-w64-noversion
-        make
-        popd
-    done
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  # build utilities for each architecture
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/${_arch}" ../
+    make
+    popd
+  done
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    for _arch in ${_architectures}; do
-        pushd build-${_arch}
-        make install
-        popd
-    done
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  for _arch in ${_architectures}; do
+    pushd build-${_arch}
+    make install-mingw-w64-strip
+    popd
+  done
 }
diff --git a/tasky-client/default/PKGBUILD b/tasky-client/default/PKGBUILD
deleted file mode 100644
index 3678d0c8..00000000
--- a/tasky-client/default/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=tasky-client
-pkgver=1.0.0
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc="Tasky client"
-license=('GPL')
-depends=('qt5-base' 'qt5-network' 'libtasky')
-makedepends=
-url="https://github.com/Martchus/tasky-client"
-source=("tasky-client-${pkgver}.tar.gz::https://github.com/Martchus/tasky-client/archive/v${pkgver}.tar.gz")
-_reponame=tasky-client
-sha256sums=('SKIP')
-
-build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro"
-    make
-}
-
-package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    make install
-}
-
diff --git a/tasky-client/mingw-w64/PKGBUILD b/tasky-client/mingw-w64/PKGBUILD
deleted file mode 100644
index 667d7789..00000000
--- a/tasky-client/mingw-w64/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-_name=tasky-client
-pkgname=mingw-w64-tasky-client
-pkgver=1.0.0
-pkgrel=1
-arch=('any')
-pkgdesc="Tasky client (mingw-w64)."
-license=('GPL')
-depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-qt5-network' 'mingw-w64-libtasky')
-makedepends=('mingw-w64-gcc')
-url="https://github.com/Martchus/tasky-client"
-source=("qtutilities-${pkgver}.tar.gz::https://github.com/Martchus/tasky-client/archive/v${pkgver}.tar.gz")
-_reponame=tasky-client
-sha256sums=('SKIP')
-options=('staticlibs' '!strip')
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
-
-build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    # build utilities for each architecture
-    for _arch in ${_architectures}; do
-        mkdir -p build-${_arch} && pushd build-${_arch}
-        INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-dll CONFIG+=mingw-w64-noversion
-        make
-        popd
-    done
-}
-
-package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    for _arch in ${_architectures}; do
-        pushd build-${_arch}
-        make install
-        popd
-    done
-}
diff --git a/tasky-lib/default/PKGBUILD b/tasky-lib/default/PKGBUILD
deleted file mode 100644
index 597991fd..00000000
--- a/tasky-lib/default/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=libtasky
-pkgver=1.0.0
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc="Tasky library"
-license=('GPL')
-depends=('qt5-base' 'qt5-network' 'c++utilities')
-makedepends=
-url="https://github.com/Martchus/tasky-library"
-source=("tasky-lib-${pkgver}.tar.gz::https://github.com/Martchus/tasky-library/archive/v${pkgver}.tar.gz")
-_reponame='tasky-library'
-sha256sums=('SKIP')
-
-build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro"
-    make
-}
-
-package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    make install
-}
-
diff --git a/tasky-lib/mingw-w64/PKGBUILD b/tasky-lib/mingw-w64/PKGBUILD
deleted file mode 100644
index 00a816da..00000000
--- a/tasky-lib/mingw-w64/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-_name=libtasky
-pkgname=mingw-w64-libtasky
-pkgver=1.0.0
-pkgrel=1
-arch=('any')
-pkgdesc="Tasky library (mingw-w64)."
-license=('GPL')
-depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-qt5-network' 'mingw-w64-c++utilities')
-makedepends=('mingw-w64-gcc')
-url="https://github.com/Martchus/tasky-library"
-source=("tasky-library-${pkgver}.tar.gz::https://github.com/Martchus/tasky-library/archive/v${pkgver}.tar.gz")
-_reponame='tasky-library'
-sha256sums=('SKIP')
-options=('staticlibs' '!strip')
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
-
-build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    # build utilities for each architecture
-    for _arch in ${_architectures}; do
-        mkdir -p build-${_arch} && pushd build-${_arch}
-        INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-dll CONFIG+=mingw-w64-noversion
-        make
-        popd
-    done
-}
-
-package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    for _arch in ${_architectures}; do
-        pushd build-${_arch}
-        make install
-        popd
-    done
-}
diff --git a/tasky-server/default/PKGBUILD b/tasky-server/default/PKGBUILD
deleted file mode 100644
index ba7c07c0..00000000
--- a/tasky-server/default/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-pkgname=tasky-server
-pkgver=1.0.0
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc="Tasky server"
-license=('GPL')
-depends=('qt5-base' 'qt5-network' 'libtasky')
-makedepends=
-url="https://github.com/Martchus/tasky-server"
-source=("tasky-server-${pkgver}.tar.gz::https://github.com/Martchus/tasky-server/archive/v${pkgver}.tar.gz")
-_reponame=tasky-server
-sha256sums=('SKIP')
-
-build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro"
-    make
-}
-
-package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    make install
-}
diff --git a/tasky-server/mingw-w64/PKGBUILD b/tasky-server/mingw-w64/PKGBUILD
deleted file mode 100644
index 1492cf28..00000000
--- a/tasky-server/mingw-w64/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-_name=tasky-server
-pkgname=mingw-w64-tasky-server
-pkgver=1.0.0
-pkgrel=1
-arch=('any')
-pkgdesc="Tasky library (mingw-w64)."
-license=('GPL')
-depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-qt5-network' 'mingw-w64-libtasky')
-makedepends=('mingw-w64-gcc')
-url="https://github.com/Martchus/tasky-library"
-source=("tasky-server-${pkgver}.tar.gz::https://github.com/Martchus/tasky-server/archive/v${pkgver}.tar.gz")
-_reponame=tasky-server
-sha256sums=('SKIP')
-options=('staticlibs' '!strip')
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
-
-build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    # build utilities for each architecture
-    for _arch in ${_architectures}; do
-        mkdir -p build-${_arch} && pushd build-${_arch}
-        INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-dll CONFIG+=mingw-w64-noversion
-        make
-        popd
-    done
-}
-
-package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    for _arch in ${_architectures}; do
-        pushd build-${_arch}
-        make install
-        popd
-    done
-}
diff --git a/toggletouch/default/PKGBUILD b/toggletouch/default/PKGBUILD
index 44f507f4..3526856b 100755
--- a/toggletouch/default/PKGBUILD
+++ b/toggletouch/default/PKGBUILD
@@ -18,5 +18,5 @@ noextract=
 md5sums=('SKIP')
 
 package() {
-    install -Dm755 "${srcdir}/${PROJECT_DIR_NAME:-$pkgname-$pkgver}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm755 "${srcdir}/${PROJECT_DIR_NAME:-$pkgname-$pkgver}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
 }
diff --git a/ubuntu-latex-fonts/git/ubuntu-latex-fonts.install b/ubuntu-latex-fonts/git/ubuntu-latex-fonts.install
index c3892a02..3cad00cc 100644
--- a/ubuntu-latex-fonts/git/ubuntu-latex-fonts.install
+++ b/ubuntu-latex-fonts/git/ubuntu-latex-fonts.install
@@ -1,11 +1,11 @@
 post_install() {
-    mktexlsr
+  mktexlsr
 }
 
 post_upgrade() {
-    post_install
+  post_install
 }
 
 post_remove() {
-    post_install
+  post_install
 }
diff --git a/videodownloader/default/PKGBUILD b/videodownloader/default/PKGBUILD
index 1d5c2208..98cbb06a 100644
--- a/videodownloader/default/PKGBUILD
+++ b/videodownloader/default/PKGBUILD
@@ -1,25 +1,25 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _reponame=videodownloader
 pkgname=videodownloader
-pkgver=1.2.1
+pkgver=1.3.0
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="A video downloader with Qt GUI (currently only YouTube is maintained)."
+pkgdesc="A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained)."
 license=('GPL')
 depends=('qtutilities' 'openssl' 'desktop-file-utils' 'xdg-utils')
-makedepends=('qt5-tools')
+makedepends=('cmake' 'qt5-tools')
 install=${pkgname}.install
 url="https://github.com/Martchus/${_reponame}"
 source=("videodownloader-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('fefa04939c9310474e70b509142f7d7330e1c175d3507a081c58f447a34da347')
+sha256sums=('0680db3887715f6147247d2344745794fac6d6d57daf0173c8e2ac29b5392e30')
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro"
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  make
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
diff --git a/videodownloader/default/videodownloader.install b/videodownloader/default/videodownloader.install
index 5495fb1b..5c501dc4 100644
--- a/videodownloader/default/videodownloader.install
+++ b/videodownloader/default/videodownloader.install
@@ -1,12 +1,12 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-desktop-database -q
 }
 
 post_upgrade() {
-    post_install
+  post_install
 }
 
 post_remove() {
-    post_install
+  post_install
 }
diff --git a/videodownloader/git/PKGBUILD b/videodownloader/git/PKGBUILD
index 5120be26..9b3a165e 100644
--- a/videodownloader/git/PKGBUILD
+++ b/videodownloader/git/PKGBUILD
@@ -3,12 +3,12 @@ _name=videodownloader
 _reponame=videodownloader
 pkgname=videodownloader-git
 pkgver=27.8960d5b
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
-pkgdesc="A video downloader with Qt GUI (currently only YouTube is maintained, git version)."
+pkgdesc="A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained, mingw-w64)."
 license=('GPL')
 depends=('qtutilities' 'openssl' 'desktop-file-utils' 'xdg-utils')
-makedepends=('qt5-tools' 'git')
+makedepends=('cmake' 'qt5-tools' 'git')
 provides=('videodownloader')
 conflicts=('videodownloader')
 install=${_name}.install
@@ -17,17 +17,17 @@ source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}/${pkgname}"
-    echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  cd "${srcdir}/${pkgname}"
+  echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 build() {
-    cd "${srcdir}/${pkgname}"
-    INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$_name.pro"
-    make
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}"
-    make install
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make install
 }
diff --git a/videodownloader/git/videodownloader.install b/videodownloader/git/videodownloader.install
index 5495fb1b..5c501dc4 100644
--- a/videodownloader/git/videodownloader.install
+++ b/videodownloader/git/videodownloader.install
@@ -1,12 +1,12 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-desktop-database -q
 }
 
 post_upgrade() {
-    post_install
+  post_install
 }
 
 post_remove() {
-    post_install
+  post_install
 }
diff --git a/videodownloader/mingw-w64/PKGBUILD b/videodownloader/mingw-w64/PKGBUILD
index 5a70b302..d52327a4 100644
--- a/videodownloader/mingw-w64/PKGBUILD
+++ b/videodownloader/mingw-w64/PKGBUILD
@@ -2,34 +2,35 @@
 _name=videodownloader
 _reponame=videodownloader
 pkgname=mingw-w64-videodownloader
-pkgver=1.2.1
+pkgver=1.3.0
 pkgrel=1
 arch=('any')
-pkgdesc="A video downloader with Qt GUI (currently only YouTube is maintained, mingw-w64)."
+pkgdesc="A video downloader with Qt GUI (currently only YouTube and Vimeo are maintained, git version)."
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-qtutilities' 'mingw-w64-openssl')
-makedepends=('mingw-w64-gcc' 'ffmpeg')
+makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg')
 url="https://github.com/Martchus/${_reponame}"
 source=("videodownloader-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-md5sums=('fefa04939c9310474e70b509142f7d7330e1c175d3507a081c58f447a34da347')
+sha256sums=('0680db3887715f6147247d2344745794fac6d6d57daf0173c8e2ac29b5392e30')
+options=(!buildflags staticlibs !strip !emptydirs)
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    # build utilities for each architecture
-    for _arch in ${_architectures}; do
-        mkdir -p build-${_arch} && pushd build-${_arch}
-        INSTALL_ROOT=$pkgdir/usr/${_arch} ${_arch}-qmake-qt5 ../${_name}.pro CONFIG+=mingw-w64-install CONFIG+=mingw-w64-manualstrip-exe
-        make -j 1
-        popd
-    done
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  # build utilities for each architecture
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr/${_arch}" ../
+    make
+    popd
+  done
 }
 
 package() {
-    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-    for _arch in ${_architectures}; do
-        pushd build-${_arch}
-        make install
-        popd  
-    done
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  for _arch in ${_architectures}; do
+    pushd build-${_arch}
+    make install-mingw-w64-strip
+    popd
+  done
 }