diff --git a/pkgbuild/default/PKGBUILD b/pkgbuild/default/PKGBUILD
index 584919d..142773b 100644
--- a/pkgbuild/default/PKGBUILD
+++ b/pkgbuild/default/PKGBUILD
@@ -9,17 +9,19 @@ depends=('c++utilities')
 makedepends=
 url="https://github.com/Martchus/qtutilities"
 source=("qtutilities-${pkgver}.tar.gz::https://github.com/Martchus/qtutilities/archive/v${pkgver}.tar.gz")
+_reponame=qtutilities
 sha256sums=('cee38afc5eb60b2da4eba64107628ed7')
 
 # 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 d0df711..b63b61c 100644
--- a/pkgbuild/mingw-w64/PKGBUILD
+++ b/pkgbuild/mingw-w64/PKGBUILD
@@ -10,6 +10,7 @@ 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
 sha256sums=('4e94aff9225d8873f752995c1bcc5f15')
 options=('staticlibs' '!strip')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@@ -17,7 +18,7 @@ _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 # head end
 
 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}
@@ -28,7 +29,7 @@ build() {
 }
 
 package() {
-    cd $srcdir/$_name
+    cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
     for _arch in ${_architectures}; do       
         # bin stuff
         pushd build-${_arch}