diff --git a/bin/opsi-builder.sh b/bin/opsi-builder.sh
index 3bc5b7a..1f2752d 100755
--- a/bin/opsi-builder.sh
+++ b/bin/opsi-builder.sh
@@ -39,7 +39,6 @@ builder_controller() {
 ####################
 # Main
 ####################
-
 # get the 'real' directory this program stored in (resolve symbolic links)
 PRG=$(readlink -f $0)
 BASEDIR=`dirname "$PRG"`
diff --git a/lib/builder-targets.sh b/lib/builder-targets.sh
index 295d10e..de77ba8 100644
--- a/lib/builder-targets.sh
+++ b/lib/builder-targets.sh
@@ -90,7 +90,7 @@ builder_prepare() {
     log_debug "Distribution directory: $DIST_CACHE_DIR"
 
     # setup work directory
-    OUTPUT_DIR=$TMP_DIR/opsi-builder.`date +%Y%m%d-%H%M%S`
+    OUTPUT_DIR="$TMP_DIR/opsi-builder.`date +%Y%m%d-%H%M%S`.$$"
     mkdir -p ${OUTPUT_DIR}
     builder_check_error "Cannot create temp directory ${OUTPUT_DIR}"