--- /usr/share/archiso/configs/releng/build.sh	2014-01-04 11:31:33.000000000 +1000
+++ build.sh	2014-01-31 00:08:56.061295682 +1000
@@ -48,7 +48,7 @@ run_once() {
 make_pacman_conf() {
     local _cache_dirs
     _cache_dirs=($(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
-    sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${_cache_dirs[@]})|g" ${script_path}/pacman.conf > ${pacman_conf}
+    sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${_cache_dirs[@]})|g" ${script_path}/pacman.${arch}.conf > ${pacman_conf}
 }
 
 # Base installation, plus needed packages (root-image)
@@ -232,10 +232,9 @@ done
 
 mkdir -p ${work_dir}
 
-run_once make_pacman_conf
-
 # Do all stuff for each root-image
 for arch in i686 x86_64; do
+    run_once make_pacman_conf
     run_once make_basefs
     run_once make_packages
     run_once make_setup_mkinitcpio