diff --git a/c++utilities/git/PKGBUILD b/c++utilities/git/PKGBUILD
index d29c5a32..41416be0 100644
--- a/c++utilities/git/PKGBUILD
+++ b/c++utilities/git/PKGBUILD
@@ -6,7 +6,7 @@
 _reponame=cpp-utilities
 pkgname=c++utilities-git
 _name=${pkgname%-git}
-pkgver=50.4d6bf67
+pkgver=259.663b31c
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities'
@@ -17,7 +17,7 @@ checkdepends=('cppunit')
 provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
-source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/passwordfile/git/PKGBUILD b/passwordfile/git/PKGBUILD
index e925debd..7183277f 100644
--- a/passwordfile/git/PKGBUILD
+++ b/passwordfile/git/PKGBUILD
@@ -6,18 +6,19 @@
 _reponame=passwordfile
 pkgname=passwordfile-git
 _name=${pkgname%-git}
-pkgver=20.bcefbb6
+pkgver=45.2b28fbcc66
 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=('cmake' 'git')
+checkdepends=('cppunit')
 provides=("${_name}")
 conflicts=("${_name}")
 install=
 url="https://github.com/Martchus/${_reponame}"
-source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/passwordmanager/git/PKGBUILD b/passwordmanager/git/PKGBUILD
index 6a568b5e..2404a6bc 100644
--- a/passwordmanager/git/PKGBUILD
+++ b/passwordmanager/git/PKGBUILD
@@ -6,7 +6,7 @@
 _reponame=passwordmanager
 pkgname=passwordmanager-git
 _name=${pkgname%-git}
-pkgver=36.90d37ae
+pkgver=91.1193b9acec
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL'
@@ -16,7 +16,7 @@ makedepends=('cmake' 'qt5-tools' 'git')
 provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
-source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/qtutilities/git/PKGBUILD b/qtutilities/git/PKGBUILD
index 710ff317..cfe77645 100644
--- a/qtutilities/git/PKGBUILD
+++ b/qtutilities/git/PKGBUILD
@@ -6,7 +6,7 @@
 _reponame=qtutilities
 pkgname=qtutilities-git
 _name=${pkgname%-git}
-pkgver=35.721e79d
+pkgver=163.6078f1221a
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models'
@@ -16,7 +16,7 @@ makedepends=('cmake' 'git' 'qt5-tools')
 provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
-source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/repoindex/git/PKGBUILD b/repoindex/git/PKGBUILD
index 823b1955..89aeab0e 100644
--- a/repoindex/git/PKGBUILD
+++ b/repoindex/git/PKGBUILD
@@ -18,7 +18,7 @@ provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 options=(emptydirs)
-source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/syncthingtray/git/PKGBUILD b/syncthingtray/git/PKGBUILD
index 7d01e6e2..6f31e922 100644
--- a/syncthingtray/git/PKGBUILD
+++ b/syncthingtray/git/PKGBUILD
@@ -25,10 +25,11 @@ depends=('qtutilities-git' 'qt5-svg' 'openssl' 'desktop-file-utils' 'xdg-utils')
 [[ $_enable_kio_plugin ]] && optdepends+=('kio: KIO plugin for Syncthing actions in Dolphin')
 makedepends=('cmake' 'qt5-tools' 'git')
 checkdepends=('cppunit' 'syncthing')
+[[ $_enable_kio_plugin ]] && makedepends+=('kio')
 provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
-source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/tageditor/git/PKGBUILD b/tageditor/git/PKGBUILD
index 5296cfba..7645a56d 100644
--- a/tageditor/git/PKGBUILD
+++ b/tageditor/git/PKGBUILD
@@ -12,7 +12,7 @@ _js_provider=qml
 _reponame=tageditor
 pkgname=tageditor-git
 _name=${pkgname%-git}
-pkgver=66.77a0bc2
+pkgver=289.900eb45ef8
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska'
@@ -27,7 +27,7 @@ makedepends=('cmake' 'qt5-tools' 'git')
 provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
-source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/tagparser/git/PKGBUILD b/tagparser/git/PKGBUILD
index 2c0b5c90..c2793e44 100644
--- a/tagparser/git/PKGBUILD
+++ b/tagparser/git/PKGBUILD
@@ -6,7 +6,7 @@
 _reponame=tagparser
 pkgname=tagparser-git
 _name=${pkgname%-git}
-pkgver=59.8cc75e1
+pkgver=220.4a37d9b58f
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus and Matroska tags'
@@ -16,7 +16,7 @@ makedepends=('cmake' 'git')
 provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
-source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
diff --git a/videodownloader/git/PKGBUILD b/videodownloader/git/PKGBUILD
index 60ca4ce8..97f52df5 100644
--- a/videodownloader/git/PKGBUILD
+++ b/videodownloader/git/PKGBUILD
@@ -16,7 +16,7 @@ makedepends=('cmake' 'qt5-tools' 'git')
 provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
-source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {