diff --git a/package/base/gcc/config-300.in b/package/base/gcc/config-300.in
index ceb91fa37..1b4658447 100644
--- a/package/base/gcc/config-300.in
+++ b/package/base/gcc/config-300.in
@@ -68,13 +68,14 @@ then
 	done
 	choice ROCKCFG_DEFAULT_F77 $d $k
 
-	# build non-default CCs in stage 5
+	# build non-default CCs in stages 5 and 9
+	# and a dedicated C++ compiler in stages 2 and 9
 	k=""; for x in gcc2 gcc32 gcc33 gcc34 gcc40 gcc41; do
-		if [ "$ROCKCFG_DEFAULT_CC" != "$x" ]; then
+		if [ "$ROCKCFG_DEFAULT_CC" != "$x" ] ; then
 			if [ "$ROCKCFG_DEFAULT_CXX" != "$x" ]; then
-				k="$k / gcc=$x / s/^\(..\)...\(..\)./\1---\25/;"
+				k="$k / gcc=$x / { s/^\(.\) [0-9-]*/\1 -----5---9/; s/ CORE //g; };"
 			else
-				k="$k / gcc=$x / s/^\(..\)../\1--/;"
+				k="$k / gcc=$x /   s/^\(.\) [0-9-]*/\1 --2------9/;"
 			fi
 		fi
 	done
diff --git a/scripts/config.in b/scripts/config.in
index b0ab9f031..016747311 100644
--- a/scripts/config.in
+++ b/scripts/config.in
@@ -391,8 +391,12 @@ expert_end
 
 %include package/*/*/postconfig.in
 %include misc/*/postconfig.in
-%include architecture/*/postconfig.in
-%include target/*/postconfig.in
+
+if [ -f architecture/$ROCKCFG_ARCH/postconfig.in ]
+then . architecture/$ROCKCFG_ARCH/postconfig.in; fi
+
+if [ -f target/$ROCKCFG_TARGET/postconfig.in ]
+then . target/$ROCKCFG_TARGET/postconfig.in; fi
 
 if [ "$ROCKCFG_CROSSBUILD" = 1 ] ; then
 	pkgfilter sed -e 's,^\(. ..\)[^ ]*,\1--------,;'
diff --git a/target/crystal/postconfig.in b/target/crystal/postconfig.in
new file mode 100644
index 000000000..4fbcb076f
--- /dev/null
+++ b/target/crystal/postconfig.in
@@ -0,0 +1,31 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/target/crystal/postconfig.in
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+if [ $ROCKCFG_TARGET_CRYSTAL_BUILDADDONS = 1 ]
+then
+	pkgfilter sed \
+		-e '/CORE/ s/^\(. .........\)./\1-/' \
+		-e '/CORE/ ! s/^\(.\) .........\(.\)/\1 ---------\2/'
+else
+	pkgfilter sed -e '/CORE/ ! s/^X/O/'
+fi
+