diff --git a/icinga-build-deb-binary b/icinga-build-deb-binary
index ce1b7587fe7345d06b71d81bc93fd5145044ebbf..1b9a9b4072371cccd94d6027c93d918c9756f83e 100755
--- a/icinga-build-deb-binary
+++ b/icinga-build-deb-binary
@@ -40,6 +40,12 @@ echo "[ Extracting source to build directory ]"
 (
   set -ex
   cd "${BUILDDIR}/"
+  set -e
+  if [ -d "${ICINGA_BUILD_PROJECT}" ]; then
+    set -x
+    chmod -R u+w "${ICINGA_BUILD_PROJECT}"
+  fi
+  set -x
   rm -rf "${ICINGA_BUILD_PROJECT}"
   dpkg-source -x ./*.dsc "${ICINGA_BUILD_PROJECT}"
 )
@@ -95,6 +101,7 @@ if [ "${ICINGA_BUILD_CLEANUP:=1}" -gt 0 ]; then
   echo "[ Cleanup Build Directory ]"
   (
     set -ex
+    chmod -R u+w "${BUILDDIR:?}/${ICINGA_BUILD_PROJECT}/"
     rm -rf "${BUILDDIR:?}/${ICINGA_BUILD_PROJECT}/"
   )
 fi
diff --git a/icinga-build-deb-source b/icinga-build-deb-source
index 7f3d765b9186b29266696956f08b5c44148e70f8..050a651b0bdff6dd07418cac1001b73ce9ec60b5 100755
--- a/icinga-build-deb-source
+++ b/icinga-build-deb-source
@@ -6,7 +6,12 @@ SCRIPT_HOME="$(dirname "$(readlink -f "$0")")"
 . "${SCRIPT_HOME}"/functions-debian.sh
 
 (
-  set -ex
+  set -e
+  if [ -d "${BUILDDIR}" ]; then
+    set -x
+    chmod -R u+w "${BUILDDIR:?}/"
+  fi
+  set -x
   rm -rf "${BUILDDIR:?}/"
 )