diff --git a/src/beesh.sh.in b/src/beesh.sh.in
index 653af9b..2ffc12e 100644
--- a/src/beesh.sh.in
+++ b/src/beesh.sh.in
@@ -163,7 +163,6 @@ function check_repositories() {
 
     mkdir -pv "${BEE_BEEDIR}"
     mkdir -pv "${BEE_PKGDIR}"
-    mkdir -pv "${BEE_BUILDARCHIVEDIR}"
 
     if [ ! -w "${BEE_BEEDIR}" ] ; then
         print_error " !! ${BEE_BEEDIR} not writable"
@@ -175,13 +174,18 @@ function check_repositories() {
         r=1
     fi
 
-    if [ ! -w "${BEE_BUILDARCHIVEDIR}" ] ; then
-        print_error " !! ${BEE_BUILDARCHIVEDIR} not writable"
-        r=1
-    fi
+    if [ "${OPT_ARCHIVE_BUILD}" == "yes" ] ; then
 
-    if [ "$r"  != "0" ] ; then
-        exit 1
+        mkdir -pv "${BEE_BUILDARCHIVEDIR}"
+
+        if [ ! -w "${BEE_BUILDARCHIVEDIR}" ] ; then
+            print_error " !! ${BEE_BUILDARCHIVEDIR} not writable"
+            r=1
+        fi
+
+        if [ "$r"  != "0" ] ; then
+            exit 1
+        fi
     fi
 }