diff --git a/scripts/Build-Tools b/scripts/Build-Tools
index f093e82d9..bae29acbc 100755
--- a/scripts/Build-Tools
+++ b/scripts/Build-Tools
@@ -273,9 +273,9 @@ EOT
 	     architecture/$arch/. package/. target/$target/. misc/ -type f \
 	     -name 'parse-config-fixarch' \
 	     -printf '%f\t%p\n' | sort | awk '{ $1="."; print; }' \
-			> build/$ROCKCFG_ID/$toolsdir/lib/parse-config-fixarch.$$
-	mv build/$ROCKCFG_ID/$toolsdir/lib/parse-config-fixarch.$$ \
-	   build/$ROCKCFG_ID/$toolsdir/lib/parse-config-fixarch
+			> build/$ROCKCFG_ID/ROCK/$toolsdir/lib/parse-config-fixarch.$$
+	mv build/$ROCKCFG_ID/ROCK/$toolsdir/lib/parse-config-fixarch.$$ \
+	   build/$ROCKCFG_ID/ROCK/$toolsdir/lib/parse-config-fixarch
 
 	# Create pkg_*_{pre,post}.conf files
 	#
diff --git a/scripts/parse-config b/scripts/parse-config
index fc58dc331..4fe75fcbb 100644
--- a/scripts/parse-config
+++ b/scripts/parse-config
@@ -116,15 +116,15 @@ then . $base/build/$ROCKCFG_ID/ROCK/$toolsdir/lib/wrapper-config ; fi
 
 if [ "$stagelevel" -gt 1 -o "$ROCKCFG_USE_CROSSCC" = 0 ]
 then
-	if [ -f $base/build/$ROCKCFG_ID/$toolsdir/lib/parse-config-fixarch ]
-	then . $base/build/$ROCKCFG_ID/$toolsdir/lib/parse-config-fixarch ; fi
+	if [ -f $base/build/$ROCKCFG_ID/ROCK/$toolsdir/lib/parse-config-fixarch ]
+	then . $base/build/$ROCKCFG_ID/ROCK/$toolsdir/lib/parse-config-fixarch ; fi
 
 	arch_build="$arch_target" ; archprefix=""
 else
 	arch_build="`uname -m`-nocross-linux-gnu"
 
-	if [ -f $base/build/$ROCKCFG_ID/$toolsdir/lib/parse-config-fixarch ]
-	then . $base/build/$ROCKCFG_ID/$toolsdir/lib/parse-config-fixarch ; fi
+	if [ -f $base/build/$ROCKCFG_ID/ROCK/$toolsdir/lib/parse-config-fixarch ]
+	then . $base/build/$ROCKCFG_ID/ROCK/$toolsdir/lib/parse-config-fixarch ; fi
 
 	if [ $stagelevel -eq 1 ]; then
 		archprefix="${arch_target}-"