diff --git a/pkgbuild/default/PKGBUILD b/pkgbuild/default/PKGBUILD
index 64bd0d7..20708d6 100644
--- a/pkgbuild/default/PKGBUILD
+++ b/pkgbuild/default/PKGBUILD
@@ -10,17 +10,18 @@ depends=('qt5-base')
 makedepends=
 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
 sha256sums=('4e94aff9225d8873f752995c1bcc5f15')
 
 # head end
 
 build() {
-    cd $srcdir/$pkgname
+    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
     INSTALL_ROOT=$pkgdir/usr/ qmake-qt5 "$pkgname.pro" -r -spec linux-g++
     make
 }
 
 package() {
-    cd $srcdir/$pkgname
+    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
     make install
 }
diff --git a/pkgbuild/mingw-w64/PKGBUILD b/pkgbuild/mingw-w64/PKGBUILD
index 302f336..d81df62 100644
--- a/pkgbuild/mingw-w64/PKGBUILD
+++ b/pkgbuild/mingw-w64/PKGBUILD
@@ -17,7 +17,7 @@ _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 # head end
 
 build() {
-    cd $srcdir/$_name
+    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
     # build for each architecture
     for _arch in ${_architectures}; do
         mkdir -p build-${_arch} && pushd build-${_arch}
@@ -28,7 +28,7 @@ build() {
 }
 
 package() {
-    cd $srcdir/$_name
+    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
     for _arch in ${_architectures}; do
         # bin stuff
         pushd build-${_arch}