diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla
index 5bbddd30..e804dbb6 100755
--- a/src/freedombone-app-hubzilla
+++ b/src/freedombone-app-hubzilla
@@ -353,28 +353,23 @@ function install_hubzilla {
         mkdir /var/www/$HUBZILLA_DOMAIN_NAME
     fi
     if [ ! -d $HUBZILLA_PATH ]; then
-        mkdir $HUBZILLA_PATH
+        mkdir -p $HUBZILLA_PATH
     fi
 
     if [ ! -f $HUBZILLA_PATH/index.php ]; then
-        cd $INSTALL_DIR
-
         if [ -d /repos/hubzilla ]; then
-            mkdir hubzilla
-            cp -r -p /repos/hubzilla/. hubzilla
-            cd hubzilla
+            mkdir $HUBZILLA_PATH
+            cp -r -p /repos/hubzilla/. $HUBZILLA_PATH
+            cd $HUBZILLA_PATH
             git pull
         else
             function_check git_clone
-            git_clone $HUBZILLA_REPO hubzilla
+            git_clone $HUBZILLA_REPO $HUBZILLA_PATH
         fi
 
         git checkout $HUBZILLA_COMMIT -b $HUBZILLA_COMMIT
         set_completion_param "hubzilla commit" "$HUBZILLA_COMMIT"
 
-        rm -rf $HUBZILLA_PATH
-        mv hubzilla $HUBZILLA_PATH
-
         if [ -d /repos/hubzilla-addons ]; then
             mkdir $HUBZILLA_PATH/addon
             cp -r -p /repos/hubzilla-addons/. $HUBZILLA_PATH/addon