diff --git a/c++utilities/git/PKGBUILD b/c++utilities/git/PKGBUILD
index 390eeefe..64617ff8 100644
--- a/c++utilities/git/PKGBUILD
+++ b/c++utilities/git/PKGBUILD
@@ -15,7 +15,7 @@ depends=()
 optdepends=("$_name-doc: API documentation")
 makedepends=('cmake' 'git')
 checkdepends=('cppunit')
-provides=("${_name}")
+#provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
@@ -28,7 +28,11 @@ pkgver() {
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" .
+  cmake \
+    -DCMAKE_BUILD_TYPE:STRING='Release' \
+    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    .
   make
 }
 
diff --git a/passwordfile/git/PKGBUILD b/passwordfile/git/PKGBUILD
index d9c1480a..85f1d804 100644
--- a/passwordfile/git/PKGBUILD
+++ b/passwordfile/git/PKGBUILD
@@ -15,7 +15,7 @@ depends=('c++utilities-git' 'openssl')
 optdepends=("$_name-doc: API documentation")
 makedepends=('cmake' 'git')
 checkdepends=('cppunit')
-provides=("${_name}")
+#provides=("${_name}")
 conflicts=("${_name}")
 install=
 url="https://github.com/Martchus/${_reponame}"
@@ -29,7 +29,11 @@ pkgver() {
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" .
+  cmake \
+    -DCMAKE_BUILD_TYPE:STRING='Release' \
+    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    .
   make
 }
 
diff --git a/qtutilities/git/PKGBUILD b/qtutilities/git/PKGBUILD
index b8f37c92..53831893 100644
--- a/qtutilities/git/PKGBUILD
+++ b/qtutilities/git/PKGBUILD
@@ -14,7 +14,7 @@ license=('GPL')
 depends=('c++utilities-git' 'qt5-base' 'mesa')
 optdepends=("$_name-doc: API documentation")
 makedepends=('cmake' 'git' 'qt5-tools')
-provides=("${_name}")
+#provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
@@ -27,7 +27,11 @@ pkgver() {
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" .
+  cmake \
+    -DCMAKE_BUILD_TYPE:STRING='Release' \
+    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    .
   make
 }
 
diff --git a/reflective-rapidjson/git/PKGBUILD b/reflective-rapidjson/git/PKGBUILD
index cb3ff58b..5c3f9103 100644
--- a/reflective-rapidjson/git/PKGBUILD
+++ b/reflective-rapidjson/git/PKGBUILD
@@ -17,7 +17,7 @@ optdepends=("boost: use Boost.Hana instead of code generator"
             "$_name-doc: API documentation")
 makedepends=('cmake' 'clang-tools-extra' 'llvm' 'git')
 checkdepends=('cppunit' 'boost')
-provides=("${_name}")
+#provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_reponame}.git")
@@ -30,7 +30,11 @@ pkgver() {
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" .
+  cmake \
+    -DCMAKE_BUILD_TYPE:STRING='Release' \
+    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    .
   make
 }
 
diff --git a/repoindex/git/PKGBUILD b/repoindex/git/PKGBUILD
index e650c731..0d245102 100644
--- a/repoindex/git/PKGBUILD
+++ b/repoindex/git/PKGBUILD
@@ -11,8 +11,8 @@ pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Repository browser for Arch Linux'
 license=('GPL')
-depends=('qt5-base' 'qt5-websockets' 'karchive' 'pacman' 'c++utilities')
-makedepends=('cmake' 'git' 'yuicompressor' 'qtutilities')
+depends=('qt5-base' 'qt5-websockets' 'karchive' 'pacman' 'c++utilities-git')
+makedepends=('cmake' 'git' 'yuicompressor' 'qtutilities-git')
 backup=("etc/${_reponame}.conf")
 provides=("${_name}")
 conflicts=("${_name}")
@@ -28,13 +28,17 @@ pkgver() {
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" .
+  cmake \
+    -DCMAKE_BUILD_TYPE:STRING='Release' \
+    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    .
   make
 }
 
 package_repoindex() {
   pkgdesc="Repository browser for Arch Linux (provides server binary, git version)."
-  depends=('qt5-base' 'qt5-websockets' 'karchive' 'c++utilities')
+  depends=('qt5-base' 'qt5-websockets' 'karchive' 'c++utilities-git')
   optdepends=('repoindex-header: header files')
   optdepends=('repoindex-web: file for web UI')
   optdepends=('repoindex-gui: application showing the web UI')
diff --git a/syncthingtray/git/PKGBUILD b/syncthingtray/git/PKGBUILD
index 1ea7662a..2a129ca1 100644
--- a/syncthingtray/git/PKGBUILD
+++ b/syncthingtray/git/PKGBUILD
@@ -59,12 +59,15 @@ pkgver() {
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
+
   local additional_args=
   [[ $_enable_kio_plugin ]] || additional_args+=' -DNO_FILE_ITEM_ACTION_PLUGIN=ON'
   [[ $_enable_plasmoid ]] || additional_args+=' -DNO_PLASMOID=ON'
+
   cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DCMAKE_BUILD_TYPE:STRING='Release' \
+    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
     -DWEBVIEW_PROVIDER="${_webview_provider}" \
     -DJS_PROVIDER="${_js_provider}" \
     -DSYSTEMD_SUPPORT=ON \
diff --git a/tageditor/git/PKGBUILD b/tageditor/git/PKGBUILD
index 8b9e2e16..456f174f 100644
--- a/tageditor/git/PKGBUILD
+++ b/tageditor/git/PKGBUILD
@@ -43,8 +43,9 @@ pkgver() {
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DCMAKE_BUILD_TYPE:STRING='Release' \
+    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
     -DWEBVIEW_PROVIDER="${_webview_provider}" \
     -DJS_PROVIDER="${_js_provider}" \
     -DENABLE_JSON_EXPORT="${_json_export}" \
diff --git a/tagparser/git/PKGBUILD b/tagparser/git/PKGBUILD
index c5741c7c..c3c2ab6d 100644
--- a/tagparser/git/PKGBUILD
+++ b/tagparser/git/PKGBUILD
@@ -28,7 +28,11 @@ pkgver() {
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" .
+  cmake \
+    -DCMAKE_BUILD_TYPE:STRING='Release' \
+    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    .
   make
 }
 
diff --git a/videodownloader/git/PKGBUILD b/videodownloader/git/PKGBUILD
index 4b6804bb..9f176432 100644
--- a/videodownloader/git/PKGBUILD
+++ b/videodownloader/git/PKGBUILD
@@ -20,13 +20,17 @@ source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git://github.com/Martchus}/${_
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" .
+  cmake \
+    -DCMAKE_BUILD_TYPE:STRING='Release' \
+    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    .
   make
 }