diff --git a/pianobooster/custom/PKGBUILD b/pianobooster/custom/PKGBUILD
index 32073396..6d5b3ff7 100644
--- a/pianobooster/custom/PKGBUILD
+++ b/pianobooster/custom/PKGBUILD
@@ -3,7 +3,7 @@ pkgname='pianobooster-custom'
 pkgdesc='A MIDI file player that teaches you how to play the piano (with custom, experimental patches)'
 pkgver=1.0.1
 pkgrel=1
-depends=('ftgl' 'hicolor-icon-theme' 'qt6-base' 'libfluidsynth.so' 'librtmidi.so' 'libqtutilities-qt6.so')
+depends=('ftgl' 'hicolor-icon-theme' 'qt6-base' 'libfluidsynth.so' 'librtmidi.so' 'libqtutilities-qt6-git.so')
 makedepends=('git' 'cmake' 'clang' 'qt6-tools' 'qt6-declarative' 'ninja')
 optdepends=('qt6-translations')
 conflicts=('pianobooster')
@@ -19,21 +19,19 @@ pkgver() {
 }
 
 build () {
-  cd "${srcdir}/${_pkgname}"
-  cmake -G Ninja -B build \
+  cmake -G Ninja -B build -S "${srcdir}/${_pkgname}" \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DUSE_SYSTEM_FONT=ON \
         -DUSE_JACK=ON \
         -DWITH_INTERNAL_FLUIDSYNTH=ON \
-        -DCONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES=-qt6 \
+        -DCONFIGURATION_PACKAGE_SUFFIX=-git \
+        -DCONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES=-qt6-git \
         -DQT_PACKAGE_PREFIX=Qt6 \
-        -DWITH_MAN=ON \
-        .
+        -DWITH_MAN=ON
   VERBOSE=1 cmake --build build
 }
 
 package () {
-  cd "${srcdir}/${_pkgname}"
   DESTDIR="$pkgdir" cmake --install build
 }
diff --git a/qtutilities/qt6-git/PKGBUILD b/qtutilities/qt6-git/PKGBUILD
new file mode 100644
index 00000000..de6d3c9a
--- /dev/null
+++ b/qtutilities/qt6-git/PKGBUILD
@@ -0,0 +1,52 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+_reponame=qtutilities
+_cfg=qt6-git
+pkgname=qtutilities-$_cfg
+_name=${pkgname%-$_cfg}
+pkgver=501.0e9637f
+pkgrel=1
+arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
+pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (using Qt 6)'
+license=('GPL')
+depends=('libc++utilities-git.so' 'qt6-base')
+makedepends=('cmake' 'git' 'ninja' 'qt6-tools' 'qt6-declarative' 'clang' 'mesa')
+optdepends=("$_name-doc: API documentation")
+provides=(libqtutilities-qt6-git.so)
+url="https://github.com/Martchus/${_reponame}"
+source=("${_reponame}::${MARTCHUS_GIT_URL_PREFIX:-git+https://github.com/Martchus}/${_reponame}.git")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
+  echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+}
+
+build() {
+  cmake \
+    -G Ninja \
+    -S "${PROJECT_DIR_NAME:-$_reponame}" \
+    -B build \
+    -DCMAKE_BUILD_TYPE:STRING='Release' \
+    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+    -DCONFIGURATION_NAME:STRING="$_cfg" \
+    -DCONFIGURATION_DISPLAY_NAME="Qt 6" \
+    -DCONFIGURATION_PACKAGE_SUFFIX:STRING='-git' \
+    -DCONFIGURATION_TARGET_SUFFIX:STRING="$_cfg" \
+    -DQT_PACKAGE_PREFIX:STRING='Qt6' \
+    -DBUILTIN_TRANSLATIONS:BOOL=ON \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    .
+  cmake --build build
+}
+
+check() {
+  QT_QPA_PLATFORM=offscreen cmake --build build --target check
+}
+
+package() {
+  DESTDIR="${pkgdir}" cmake --install build
+}