diff --git a/c++utilities/default/PKGBUILD b/c++utilities/default/PKGBUILD
index cdb26a04..8d58a64a 100644
--- a/c++utilities/default/PKGBUILD
+++ b/c++utilities/default/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Martchus <martchus@gmx.net>
+_reponame=cpp-utilities
 pkgname=c++utilities
 pkgver=3.0.0
 pkgrel=1
@@ -8,9 +9,8 @@ as argument parser, IO and conversion utilities."
 license=('GPL')
 depends=('gcc-libs')
 makedepends=('qt5-base')
-url="https://github.com/Martchus/cpp-utilities"
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/cpp-utilities/archive/v${pkgver}.tar.gz")
-_reponame=cpp-utilities
+url="https://github.com/Martchus/${_reponame}"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
 sha256sums=('6de9cb9d9d2af191be79652590d5a23dfaa886c5384c59e7227508542d764dff')
 
 build() {
diff --git a/c++utilities/git/PKGBUILD b/c++utilities/git/PKGBUILD
index 57080184..30dbb0e1 100644
--- a/c++utilities/git/PKGBUILD
+++ b/c++utilities/git/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _name=c++utilities
+_reponame=cpp-utilities
 pkgname=c++utilities-git
 pkgver=50.4d6bf67
 pkgrel=5
@@ -11,9 +12,8 @@ depends=('gcc-libs')
 makedepends=('qt5-base' 'git')
 provides=('c++utilities')
 conflicts=('c++utilities')
-url="https://github.com/Martchus/cpp-utilities"
-source=("${pkgname}::git://github.com/Martchus/cpp-utilities.git")
-_reponame=cpp-utilities
+url="https://github.com/Martchus/${_reponame}"
+source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/c++utilities/mingw-w64/PKGBUILD b/c++utilities/mingw-w64/PKGBUILD
index 3d6ed3f1..5ec5f5a6 100644
--- a/c++utilities/mingw-w64/PKGBUILD
+++ b/c++utilities/mingw-w64/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _name=c++utilities
+_reponame=cpp-utilities
 pkgname=mingw-w64-c++utilities
 pkgver=3.0.0
 pkgrel=1
@@ -9,9 +10,8 @@ as argument parser, IO and conversion utilities (mingw-w64)."
 license=('GPL')
 depends=('mingw-w64-crt')
 makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-base')
-url="https://github.com/Martchus/cpp-utilities"
-source=("c++utilities-${pkgver}.tar.gz::https://github.com/Martchus/cpp-utilities/archive/v${pkgver}.tar.gz")
-_reponame=cpp-utilities
+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')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
diff --git a/dbus-soundrecorder/default/PKGBUILD b/dbus-soundrecorder/default/PKGBUILD
index d0ba745c..fe2d3ced 100644
--- a/dbus-soundrecorder/default/PKGBUILD
+++ b/dbus-soundrecorder/default/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Martchus <martchus@gmx.net>
+_reponame=dbus-soundrecorder
 pkgname=dbus-soundrecorder
 pkgver=1.1.0
 pkgrel=2
@@ -7,9 +8,8 @@ pkgdesc="Records sound from Pulse Audio using ffmpeg while watching D-Bus to det
 license=('GPL')
 depends=('c++utilities')
 makedepends=('qt5-base')
-url="https://github.com/Martchus/dbus-soundrecorder"
-source=("dbus-soundrecorder-${pkgver}.tar.gz::https://github.com/Martchus/dbus-soundrecorder/archive/v${pkgver}.tar.gz")
-_reponame=dbus-soundrecorder
+url="https://github.com/Martchus/${_reponame}"
+source=("dbus-soundrecorder-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
 sha256sums=('0af1914803cf2f1d11fdb8e46f6c896a18040f6606a08d0742356dc0c7872261')
 
 build() {
diff --git a/diriterator/default/PKGBUILD b/diriterator/default/PKGBUILD
index 2be880ba..a997590f 100755
--- a/diriterator/default/PKGBUILD
+++ b/diriterator/default/PKGBUILD
@@ -7,7 +7,7 @@ arch=('any')
 license=('GPL')
 groups=
 provides=
-depends=("parallel")
+depends=('parallel')
 makedepends=
 conflicts=
 replaces=
diff --git a/geocoordinatecalculator/default/PKGBUILD b/geocoordinatecalculator/default/PKGBUILD
index f28a3549..6f2ccc00 100644
--- a/geocoordinatecalculator/default/PKGBUILD
+++ b/geocoordinatecalculator/default/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Martchus <martchus@gmx.net>
+_reponame=geocoordinatecalculator
 pkgname=geocoordinatecalculator
 pkgver=1.0.1
 pkgrel=1
@@ -7,9 +8,8 @@ pkgdesc="Tool for basic calculations with geo coordinates such as format convers
 license=('GPL')
 depends=('c++utilities')
 makedepends=('qt5-base')
-url="https://github.com/Martchus/geocoordinatecalculator"
-source=("geocoordinatecalculator-${pkgver}.tar.gz::https://github.com/Martchus/geocoordinatecalculator/archive/v${pkgver}.tar.gz")
-_reponame=geocoordinatecalculator
+url="https://github.com/Martchus/${_reponame}"
+source=("geocoordinatecalculator-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
 sha256sums=('5eeeb11027e93bf676977877013756ccb17047d539596f24d20ab8b3787c9cbf')
 
 build() {
diff --git a/geocoordinatecalculator/mingw-w64/PKGBUILD b/geocoordinatecalculator/mingw-w64/PKGBUILD
index 6bb4ec89..0ec9ed55 100644
--- a/geocoordinatecalculator/mingw-w64/PKGBUILD
+++ b/geocoordinatecalculator/mingw-w64/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _name=geocoordinatecalculator
+_reponame=geocoordinatecalculator
 pkgname=mingw-w64-geocoordinatecalculator
 pkgver=1.0.1
 pkgrel=1
@@ -8,9 +9,8 @@ pkgdesc="Tool for basic calculations with geo coordinates such as format convers
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-c++utilities')
 makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-base')
-url="https://github.com/Martchus/geocoordinatecalculator"
-source=("geocoordinatecalculator-${pkgver}.tar.gz::https://github.com/Martchus/geocoordinatecalculator/archive/v${pkgver}.tar.gz")
-_reponame=geocoordinatecalculator
+url="https://github.com/Martchus/${_reponame}"
+source=("geocoordinatecalculator-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
 sha256sums=('SKIP')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
diff --git a/passwordfile/default/PKGBUILD b/passwordfile/default/PKGBUILD
index 2dacaa3c..f07e780b 100644
--- a/passwordfile/default/PKGBUILD
+++ b/passwordfile/default/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Martchus <martchus@gmx.net>
+_reponame=passwordfile
 pkgname=passwordfile
 pkgver=3.0.1
 pkgrel=1
@@ -8,9 +9,8 @@ license=('GPL')
 depends=('c++utilities' 'openssl')
 makedepends=('qt5-base')
 install=
-url="https://github.com/Martchus/passwordfile"
-source=("passwordfile-${pkgver}.tar.gz::https://github.com/Martchus/passwordfile/archive/v${pkgver}.tar.gz")
-_reponame=passwordfile
+url="https://github.com/Martchus/${_reponame}"
+source=("passwordfile-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
 sha256sums=('959176b21b45c8435c7c87d501c263dc4d8088e861b8659294448f6c77768ebb')
 
 build() {
diff --git a/passwordfile/git/PKGBUILD b/passwordfile/git/PKGBUILD
index 4f71f711..25ae90c6 100644
--- a/passwordfile/git/PKGBUILD
+++ b/passwordfile/git/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _name=passwordfile
+_reponame=passwordfile
 pkgname=passwordfile-git
 pkgver=20.bcefbb6
 pkgrel=5
@@ -11,9 +12,8 @@ makedepends=('qt5-base' 'git')
 provides=('passwordfile')
 conflicts=('passwordfile')
 install=
-url="https://github.com/Martchus/passwordfile"
-source=("${pkgname}::git://github.com/Martchus/passwordfile.git")
-_reponame=passwordfile
+url="https://github.com/Martchus/${_reponame}"
+source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/passwordfile/mingw-w64/PKGBUILD b/passwordfile/mingw-w64/PKGBUILD
index ef5ecc44..4a99f485 100644
--- a/passwordfile/mingw-w64/PKGBUILD
+++ b/passwordfile/mingw-w64/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _name=passwordfile
+_reponame=passwordfile
 pkgname=mingw-w64-passwordfile
 pkgver=3.0.1
 pkgrel=1
@@ -8,9 +9,8 @@ pkgdesc="C++ library to read/write passwords from/to encrypted files (using AES-
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-c++utilities' 'mingw-w64-openssl')
 makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-base')
-url="https://github.com/Martchus/passwordfile"
-source=("passwordfile-${pkgver}.tar.gz::https://github.com/Martchus/passwordfile/archive/v${pkgver}.tar.gz")
-_reponame=passwordfile
+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')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
diff --git a/passwordmanager/default/PKGBUILD b/passwordmanager/default/PKGBUILD
index c254ff5f..3220adb3 100644
--- a/passwordmanager/default/PKGBUILD
+++ b/passwordmanager/default/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Martchus <martchus@gmx.net>
+_reponame=passwordmanager
 pkgname=passwordmanager
 pkgver=2.0.9
 pkgrel=1
@@ -8,9 +9,8 @@ license=('GPL')
 depends=('qt5-base' 'qtutilities' 'passwordfile' 'openssl' 'libxkbcommon-x11' 'desktop-file-utils' 'xdg-utils')
 makedepends=('qt5-tools')
 install=${pkgname}.install
-url="https://github.com/Martchus/passwordmanager"
-source=("passwordmanager-${pkgver}.tar.gz::https://github.com/Martchus/passwordmanager/archive/v${pkgver}.tar.gz")
-_reponame=passwordmanager
+url="https://github.com/Martchus/${_reponame}"
+source=("passwordmanager-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
 sha256sums=('a6086f9dd394064368dd0098f01be163bccd6aa00e7c093f5a2cbf1b5951c176')
 
 build() {
diff --git a/passwordmanager/git/PKGBUILD b/passwordmanager/git/PKGBUILD
index 26f79955..bdfc43b0 100644
--- a/passwordmanager/git/PKGBUILD
+++ b/passwordmanager/git/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _name=passwordmanager
+_reponame=passwordmanager
 pkgname=passwordmanager-git
 pkgver=36.90d37ae
 pkgrel=9
@@ -11,9 +12,8 @@ makedepends=('qt5-tools' 'git')
 provides=('passwordmanager')
 conflicts=('passwordmanager')
 install=${_name}.install
-url="https://github.com/Martchus/passwordmanager"
-source=("${pkgname}::git://github.com/Martchus/passwordmanager.git")
-_reponame=passwordmanager
+url="https://github.com/Martchus/${_reponame}"
+source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/passwordmanager/mingw-w64/PKGBUILD b/passwordmanager/mingw-w64/PKGBUILD
index 4043f856..017a7da0 100644
--- a/passwordmanager/mingw-w64/PKGBUILD
+++ b/passwordmanager/mingw-w64/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _name=passwordmanager
+_reponame=passwordmanager
 pkgname=mingw-w64-passwordmanager
 pkgver=2.0.9
 pkgrel=1
@@ -7,10 +8,9 @@ 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')
-url="https://github.com/Martchus/passwordmanager"
-source=("passwordmanager-${pkgver}.tar.gz::https://github.com/Martchus/passwordmanager/archive/v${pkgver}.tar.gz")
-_reponame=passwordmanager
+makedepends=('mingw-w64-gcc' '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')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
diff --git a/qtutilities/default/PKGBUILD b/qtutilities/default/PKGBUILD
index 33425628..d680d65d 100644
--- a/qtutilities/default/PKGBUILD
+++ b/qtutilities/default/PKGBUILD
@@ -8,8 +8,8 @@ pkgdesc="Common Qt related C++ classes and routines used by my
 license=('GPL')
 depends=('c++utilities' 'qt5-base')
 makedepends=
-url="https://github.com/Martchus/qtutilities"
-source=("qtutilities-${pkgver}.tar.gz::https://github.com/Martchus/qtutilities/archive/v${pkgver}.tar.gz")
+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')
 
diff --git a/qtutilities/git/PKGBUILD b/qtutilities/git/PKGBUILD
index 791ff6bd..e7bf0524 100644
--- a/qtutilities/git/PKGBUILD
+++ b/qtutilities/git/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _name=qtutilities
+_reponame=qtutilities
 pkgname=qtutilities-git
 pkgver=35.721e79d
 pkgrel=5
@@ -11,9 +12,8 @@ depends=('c++utilities' 'qt5-base')
 makedepends=('git')
 provides=('qtutilities')
 conflicts=('qtutilities')
-url="https://github.com/Martchus/qtutilities"
-source=("${pkgname}::git://github.com/Martchus/qtutilities.git")
-_reponame=qtutilities
+url="https://github.com/Martchus/${_reponame}"
+source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/qtutilities/mingw-w64/PKGBUILD b/qtutilities/mingw-w64/PKGBUILD
index a6e5ac78..5101b090 100644
--- a/qtutilities/mingw-w64/PKGBUILD
+++ b/qtutilities/mingw-w64/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _name=qtutilities
+_reponame=qtutilities
 pkgname=mingw-w64-qtutilities
 pkgver=3.0.1
 pkgrel=1
@@ -9,9 +10,8 @@ pkgdesc="Common Qt related C++ classes and routines used by my
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-qt5-base' 'mingw-w64-c++utilities')
 makedepends=('mingw-w64-gcc')
-url="https://github.com/Martchus/qtutilities"
-source=("qtutilities-${pkgver}.tar.gz::https://github.com/Martchus/qtutilities/archive/v${pkgver}.tar.gz")
-_reponame=qtutilities
+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')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
diff --git a/repoindex/default/PKGBUILD b/repoindex/default/PKGBUILD
index c78a1379..b40d87e8 100644
--- a/repoindex/default/PKGBUILD
+++ b/repoindex/default/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Martchus <martchus@gmx.net>
+_reponame=repoindex
 pkgname=repoindex
 pkgver=1.0.0
 pkgrel=2
@@ -7,8 +8,8 @@ pkgdesc="Provides a web interface to browse Arch Linux package repositories."
 license=('GPL')
 depends=('qt5-base' 'qt5-network' 'pacman' 'c++utilities')
 makedepends=
-url="https://github.com/Martchus/repoindex"
-source=("repoindex-${pkgver}.tar.gz::https://github.com/Martchus/repoindex/archive/v${pkgver}.tar.gz")
+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')
 
diff --git a/repoindex/git/PKGBUILD b/repoindex/git/PKGBUILD
index 3ef8a5cb..b910d5a7 100644
--- a/repoindex/git/PKGBUILD
+++ b/repoindex/git/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Martchus <martchus@gmx.net>
+_reponame=repoindex
 pkgname=repoindex
 pkgver=1.0.0
 pkgrel=3
@@ -7,9 +8,8 @@ pkgdesc="Provides a web interface to browse Arch Linux package repositories (git
 license=('GPL')
 depends=('qt5-base' 'qt5-network' 'pacman' 'c++utilities')
 makedepends=
-url="https://github.com/Martchus/repoindex"
-source=("${pkgname}::git://github.com/Martchus/repoindex.git")
-_reponame=repoindex
+url="https://github.com/Martchus/${_reponame}"
+source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/tageditor/default/PKGBUILD b/tageditor/default/PKGBUILD
index 15c4d015..1e48944a 100644
--- a/tageditor/default/PKGBUILD
+++ b/tageditor/default/PKGBUILD
@@ -2,8 +2,9 @@
 # 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.0
+pkgver=1.2.1
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="A tag editor with Qt GUI and command-line interface supporting MP4 (iTunes), ID3, Vorbis and Matroska."
@@ -11,10 +12,9 @@ license=('GPL')
 depends=('qt5-script' $_webviewprovider 'qtutilities' 'tagparser' 'desktop-file-utils' 'xdg-utils')
 makedepends=('qt5-tools')
 install=${pkgname}.install
-url="https://github.com/Martchus/tageditor"
-source=("tageditor-${pkgver}.tar.gz::https://github.com/Martchus/tageditor/archive/v${pkgver}.tar.gz")
-_reponame=tageditor
-sha256sums=('42b0c89667069007aec6b2e04f9bd5479c95c601f4d42c0bfd5d8fc5210fb10d')
+url="https://github.com/Martchus/${_reponame}"
+source=("tageditor-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('d089b9e66616c39147b639639152c5848f59dafa2c0a9a77d0137fbed13a2af9')
 
 build() {
     cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/tageditor/git/PKGBUILD b/tageditor/git/PKGBUILD
index b3dc7e02..f122eb5e 100644
--- a/tageditor/git/PKGBUILD
+++ b/tageditor/git/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Martchus <martchus@gmx.net>
+_name=tageditor
+_reponame=tageditor
 # 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
-_name=tageditor
 pkgname=tageditor-git
 pkgver=66.77a0bc2
 pkgrel=11
@@ -14,9 +15,9 @@ makedepends=('qt5-tools' 'git')
 provides=('tageditor')
 conflicts=('tageditor')
 install=${_name}.install
-url="https://github.com/Martchus/tageditor"
-source=("${pkgname}::git://github.com/Martchus/tageditor.git")
-_reponame=tageditor
+url="https://github.com/Martchus/${_reponame}"
+source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
+
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/tageditor/mingw-w64/PKGBUILD b/tageditor/mingw-w64/PKGBUILD
index 8561390a..3c935aa1 100644
--- a/tageditor/mingw-w64/PKGBUILD
+++ b/tageditor/mingw-w64/PKGBUILD
@@ -1,20 +1,20 @@
 # 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.0
+pkgver=1.2.1
 pkgrel=1
 arch=('any')
 pkgdesc="A tageditor with Qt GUI and command line interface supporting MP4 (iTunes), ID3, Vorbis and Matroska."
 license=('GPL')
 depends=(mingw-w64-{crt,qt5-script,$_webviewprovider,qtutilities,tagparser})
-makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-tools')
-url="https://github.com/Martchus/tageditor"
-source=("tageditor-${pkgver}.tar.gz::https://github.com/Martchus/tageditor/archive/v${pkgver}.tar.gz")
-_reponame=tageditor
-sha256sums=('SKIP')
+makedepends=('mingw-w64-gcc' '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')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
diff --git a/tagparser/default/PKGBUILD b/tagparser/default/PKGBUILD
index 7ea036ea..22b27dc0 100644
--- a/tagparser/default/PKGBUILD
+++ b/tagparser/default/PKGBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Martchus <martchus@gmx.net>
+_reponame=tagparser
 pkgname=tagparser
-pkgver=3.0.0
+pkgver=3.0.1
 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')
-url="https://github.com/Martchus/tagparser"
-source=("tagparser-${pkgver}.tar.gz::https://github.com/Martchus/tagparser/archive/v${pkgver}.tar.gz")
-_reponame=tagparser
-sha256sums=('2190d5d3c3305554a070082f7e285a5f415865575a7280bb0d628b36030dae87')
+url="https://github.com/Martchus/${_reponame}"
+source=("tagparser-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('4b4f029170e934976f7619da3f89ffb34ce173dd6f36f3a9afe4cb1f37802af8')
 
 build() {
     cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/tagparser/git/PKGBUILD b/tagparser/git/PKGBUILD
index d2ebf4b7..6fc3f0da 100644
--- a/tagparser/git/PKGBUILD
+++ b/tagparser/git/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _name=tagparser
+_reponame=tagparser
 pkgname=tagparser-git
 pkgver=59.8cc75e1
 pkgrel=2
@@ -10,9 +11,8 @@ depends=('c++utilities')
 makedepends=('qt5-base' 'git')
 provides=('videodownloader')
 conflicts=('videodownloader')
-url="https://github.com/Martchus/tagparser"
-source=("${pkgname}::git://github.com/Martchus/tagparser.git")
-_reponame=tagparser
+url="https://github.com/Martchus/${_reponame}"
+source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/tagparser/mingw-w64/PKGBUILD b/tagparser/mingw-w64/PKGBUILD
index 30a59eb6..1a2e0229 100644
--- a/tagparser/mingw-w64/PKGBUILD
+++ b/tagparser/mingw-w64/PKGBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _name=tagparser
+_reponame=tagparser
 pkgname=mingw-w64-tagparser
-pkgver=3.0.0
+pkgver=3.0.1
 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')
-url="https://github.com/Martchus/tagparser"
-source=("tagparser-${pkgver}.tar.gz::https://github.com/Martchus/tagparser/archive/v${pkgver}.tar.gz")
-_reponame=tagparser
-sha256sums=('SKIP')
+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')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
diff --git a/videodownloader/default/PKGBUILD b/videodownloader/default/PKGBUILD
index 1127f481..1d5c2208 100644
--- a/videodownloader/default/PKGBUILD
+++ b/videodownloader/default/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Martchus <martchus@gmx.net>
+_reponame=videodownloader
 pkgname=videodownloader
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="A video downloader with Qt GUI (currently only YouTube is maintained)."
@@ -8,10 +9,9 @@ license=('GPL')
 depends=('qtutilities' 'openssl' 'desktop-file-utils' 'xdg-utils')
 makedepends=('qt5-tools')
 install=${pkgname}.install
-url="https://github.com/Martchus/videodownloader"
-source=("videodownloader-${pkgver}.tar.gz::https://github.com/Martchus/videodownloader/archive/v${pkgver}.tar.gz")
-_reponame=videodownloader
-sha256sums=('f974eb133034f40324f33661e0e98e3c4ed8567cc17838d54e2cddc492ba458b')
+url="https://github.com/Martchus/${_reponame}"
+source=("videodownloader-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('fefa04939c9310474e70b509142f7d7330e1c175d3507a081c58f447a34da347')
 
 build() {
     cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/videodownloader/git/PKGBUILD b/videodownloader/git/PKGBUILD
index 940c30d2..5120be26 100644
--- a/videodownloader/git/PKGBUILD
+++ b/videodownloader/git/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _name=videodownloader
+_reponame=videodownloader
 pkgname=videodownloader-git
 pkgver=27.8960d5b
 pkgrel=5
@@ -11,9 +12,8 @@ makedepends=('qt5-tools' 'git')
 provides=('videodownloader')
 conflicts=('videodownloader')
 install=${_name}.install
-url="https://github.com/Martchus/videodownloader"
-source=("${pkgname}::git://github.com/Martchus/videodownloader.git")
-_reponame=videodownloader
+url="https://github.com/Martchus/${_reponame}"
+source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/videodownloader/mingw-w64/PKGBUILD b/videodownloader/mingw-w64/PKGBUILD
index 8dd0f0c9..5a70b302 100644
--- a/videodownloader/mingw-w64/PKGBUILD
+++ b/videodownloader/mingw-w64/PKGBUILD
@@ -1,21 +1,21 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _name=videodownloader
+_reponame=videodownloader
 pkgname=mingw-w64-videodownloader
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 arch=('any')
 pkgdesc="A video downloader with Qt GUI (currently only YouTube is maintained, mingw-w64)."
 license=('GPL')
 depends=('mingw-w64-crt' 'mingw-w64-qtutilities' 'mingw-w64-openssl')
-makedepends=('mingw-w64-gcc')
-url="https://github.com/Martchus/videodownloader"
-source=("videodownloader-${pkgver}.tar.gz::https://github.com/Martchus/videodownloader/archive/v${pkgver}.tar.gz")
-_reponame=videodownloader
-md5sums=('SKIP')
+makedepends=('mingw-w64-gcc' 'ffmpeg')
+url="https://github.com/Martchus/${_reponame}"
+source=("videodownloader-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+md5sums=('fefa04939c9310474e70b509142f7d7330e1c175d3507a081c58f447a34da347')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
-    cd $srcdir/$_name
+    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
     # build utilities for each architecture
     for _arch in ${_architectures}; do
         mkdir -p build-${_arch} && pushd build-${_arch}
@@ -26,7 +26,7 @@ build() {
 }
 
 package() {
-    cd $srcdir/$_name
+    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
     for _arch in ${_architectures}; do
         pushd build-${_arch}
         make install