diff --git a/misc/config/config-200-defaults.in b/misc/config/config-200-defaults.in
index 66d57b9ec..977315d28 100644
--- a/misc/config/config-200-defaults.in
+++ b/misc/config/config-200-defaults.in
@@ -27,9 +27,12 @@ menu_begin MENU_DEFAULTS 'Package Defaults'
 	block_begin 3
 		choice ROCKCFG_DEFAULT_CC gcc42 $CFGTEMP_DEFAULT_CC
 		choice ROCKCFG_DEFAULT_KCC gcc42 $CFGTEMP_DEFAULT_KCC
-		choice ROCKCFG_DEFAULT_CXX gcc42 $CFGTEMP_DEFAULT_CXX 'none' 'No_default_C++_compiler'
-		choice ROCKCFG_DEFAULT_F77 gcc42 $CFGTEMP_DEFAULT_F77 'none' 'No_default_Fortran_77_compiler'
-		choice ROCKCFG_DEFAULT_F95 gcc42 $CFGTEMP_DEFAULT_F95 'none' 'No_default_Fortran_95_compiler'
+		choice ROCKCFG_DEFAULT_CXX gcc42 $CFGTEMP_DEFAULT_CXX \
+		    'none'  'No_default_C++_compiler'
+		choice ROCKCFG_DEFAULT_F77 gcc42 $CFGTEMP_DEFAULT_F77 \
+		    'none'  'No_default_Fortran_77_compiler'
+		choice ROCKCFG_DEFAULT_F95 gcc42 $CFGTEMP_DEFAULT_F95 \
+		    'none'  'No_default_Fortran_95_compiler'
 	
 		pkgenable $ROCKCFG_DEFAULT_CC
 		pkgenable $ROCKCFG_DEFAULT_KCC
@@ -39,7 +42,7 @@ menu_begin MENU_DEFAULTS 'Package Defaults'
 	block_end
 
 	# Build non-default CCs in stages 5 and 9
-	# and dedicated C++ and Fortran77 compilers in stages 2 and 9.
+	# and dedicated C++ and Fortran77 compilers in stages 4 and 9.
 	# Also remove CORE flag from non-default compilers.
 	k=""; for x in $CFGTEMP_DEFAULT_CC $CFGTEMP_DEFAULT_CXX $CFGTEMP_DEFAULT_F77 ; do
 		if [ "$ROCKCFG_DEFAULT_CC" != "$x" ] ; then
@@ -51,7 +54,7 @@ menu_begin MENU_DEFAULTS 'Package Defaults'
 					k="$k /[ =]$x / s/\(.*\) CORE \(.*\)/\1 \2/;"
 				fi
 			else
-				k="$k /[ =]$x /   s/^\(.\) [0-9-]*/\1 --2------9/;"
+				k="$k /[ =]$x /   s/^\(.\) [0-9-]*/\1 ----4----9/;"
 			fi
 		fi
 	done
diff --git a/misc/config/config-900-crosstools.in b/misc/config/config-900-crosstools.in
index c0af2134c..f7993b4b7 100644
--- a/misc/config/config-900-crosstools.in
+++ b/misc/config/config-900-crosstools.in
@@ -1,3 +1,4 @@
+#!/bin/bash
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@@ -31,25 +32,17 @@ menu_begin MENU_CROSSTOOLS 'Cross Toolchain Creation'
 		[ "$crosstarget-unknown-linux-gnu" == "$arch_target" ] && continue ;
 		bool "Build $crosstarget cross toolchain" ROCKCFG_PKG_CROSSTOOL_$crosstarget 0
 
-		if [ "$ROCKCFG_CROSSBUILD" = "0" ] ; then
-			stages="-----5---9"
-		else
-			stages="-1--------"
-		fi
-	
 		if [ "$( eval echo \$ROCKCFG_PKG_CROSSTOOL_$crosstarget )" == 1 ] ; then
-			pkgfork binutils binutils-cross-$crosstarget stages $stages
-	
 			pkgfork linux-libc-headers linux-libc-headers-cross-$crosstarget \
-				stages $stages
-	
-			if [ "$ROCKCFG_PKG_GLIBC22_USEIT" = 1 ] ; then
-				pkgfork glibc glibc22-cross-$crosstarget stages $stages
-			else
-				pkgfork glibc glibc23-cross-$crosstarget stages $stages
-			fi
-	
-			pkgfork gcc $ROCKCFG_DEFAULT_CC-cross-$crosstarget stages $stages
+				stages -----5---9 priority 600.000
+			pkgfork linux linux26-headers-cross-$crosstarget \
+				stages -----5---9  priority 600.000
+			pkgfork glibc $ROCKCFG_PKG_GLIBC_BRANCH-cross-$crosstarget \
+				stages -----56--9 priority 601.000
+			pkgfork binutils binutils-cross-$crosstarget \
+				stages -----5---9 priority 602.000
+			pkgfork gcc $ROCKCFG_DEFAULT_CC-cross-$crosstarget \
+				stages -----56--9 priority 603.000
 		fi
 	done
 menu_end