diff --git a/autobuilder b/autobuilder
index ee27e71e3943084304beae57fe21d9f397ffccb8..cca5a6c5620a4b2986d33c924ef365497c7c9e9c 100755
--- a/autobuilder
+++ b/autobuilder
@@ -824,7 +824,7 @@ chroot_umount ()
 #
 chroot_chown ()
 {
-    chown ${2} "${KEEP}/${1}/${TEMP}/root";
+    chown ${2} "${KEEP}/${1}/${TEMP}/usr/src";
 
     chown ${2} "${KEEP}/${1}/${TEMP}/${DATA##*/}";
     chown ${2} "${KEEP}/${1}/${TEMP}/${PKGS##*/}";
@@ -1158,10 +1158,11 @@ EOF
 
 msg "Cloning package repository and building a test package...";
 $RUN_USER 2>/dev/null 1>/dev/null <<"EOF"
-if ! test -d packages; then
-    git clone https://git.adelielinux.org/adelie/packages.git;
+if ! test -d /usr/src/packages; then
+    git clone https://git.adelielinux.org/adelie/packages.git \
+        /usr/src/packages ;
 fi
-cd packages/system/zlib;
+cd /usr/src/packages/system/zlib;
 git checkout __BNCH__;
 ../../scripts/setup;
 abuild -R;
@@ -1197,7 +1198,7 @@ msg "Building 'system' (using old tools)...";
 $RUN_USER <<"EOF"
 mkdir -p __LOGS__;
 _cpu=$(cat < "__SELF__");
-cd packages;
+cd /usr/src/packages;
 scripts/setup;
 build_me=$(scripts/deplist system | scripts/depsort)
 for k in ${build_me}; do
@@ -1227,7 +1228,7 @@ msg "Building 'system' (using new tools)...";
 $RUN_USER <<"EOF"
 mkdir -p __LOGS__;
 _cpu=$(cat < "__SELF__");
-cd packages;
+cd /usr/src/packages;
 scripts/setup;
 build_me=$(scripts/deplist system | scripts/depsort)
 for k in ${build_me}; do
@@ -1248,7 +1249,6 @@ EOF
 touch .system-built
 fi
 
-
 #---------------------------------------------------------------
 # cleanup: system
 #---------------------------------------------------------------
@@ -1259,7 +1259,7 @@ fi
 #
 msg "Cleaning up temporary files in 'system'...";
 $RUN_USER <<"EOF"
-cd packages;
+cd /usr/src/packages;
 find system -type f -name built -delete;
 EOF
 
@@ -1285,7 +1285,7 @@ msg "Building 'user'...";
 $RUN_USER <<"EOF"
 mkdir -p __LOGS__;
 _cpu=$(cat < "__SELF__");
-cd packages;
+cd /usr/src/packages;
 git checkout __BNCH__; # TEMPORARY UNTIL MERGED!
 scripts/setup;
 build_me=$(scripts/deplist user | scripts/depsort | grep ^user)
@@ -1315,7 +1315,7 @@ EOF
 #
 msg "Cleaning up temporary files in 'user'...";
 $RUN_USER <<"EOF"
-cd packages;
+cd /usr/src/packages;
 find user -type f -name built -delete;
 EOF