diff --git a/architecture/powerpc/config.in b/architecture/powerpc/config.in
index e4ca48324..8e8c84f31 100644
--- a/architecture/powerpc/config.in
+++ b/architecture/powerpc/config.in
@@ -20,10 +20,16 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
+choice ROCKCFG_POWERPC_ISA common \
+	common		"Utilize the  subset of POWER and PowerPC"	\
+	power		"Optimised for generic POWER"			\
+	power2		"Optimised for generic POWER2"			\
+	powerpc		"Optimised for pure PowerPC (not MPC601 hybrid)"	\
+	powerpc64	"Optimised for PowerPC64"			\
+	common		"Optimised for both POWER and Power PC"
 
-choice ROCKCFG_POWERPC_OPT generic   \
+choice ROCKCFG_POWERPC_OPT generic \
 	generic		"No special optimisation"			\
-	rs6000		"Optimised for rs6000"				\
 	rios1		"Optimised for rios1"				\
 	rios2		"Optimised for rios2"				\
 	rsc		"Optimised for rsc"				\
@@ -41,13 +47,12 @@ choice ROCKCFG_POWERPC_OPT generic   \
 	801		"Optimised for 801"				\
 	821		"Optimised for 821"				\
 	823		"Optimised for 823"				\
-	860		"Optimised for 860"				\
-	power		"Optimised for generic POWER"			\
-	power2		"Optimised for generic POWER 2"			\
-	powerpc		"Optimised for pure Power PC (i.e. not MPC601)"	\
-	common		"Optimised for both POWER and Power PC"
+	860		"Optimised for 860"
+
+if [ $ROCKCFG_POWERPC_ISA != common ] ; then
+	ROCKCFG_ID="$ROCKCFG_ID-$ROCKCFG_POWERPC_ISA"
+fi
 
 if [ $ROCKCFG_POWERPC_OPT != generic ] ; then
 	ROCKCFG_ID="$ROCKCFG_ID-$ROCKCFG_POWERPC_OPT"
 fi
-
diff --git a/architecture/powerpc/gcc-options b/architecture/powerpc/gcc-options
index 59d41b18c..5aa01b4c3 100644
--- a/architecture/powerpc/gcc-options
+++ b/architecture/powerpc/gcc-options
@@ -1,5 +1,8 @@
 
-if [ "$ROCKCFG_POWERPC_OPT" != "generic" ] ; then
-	var_append GCC_WRAPPER_INSERT " " "-mcpu=$ROCKCFG_POWERPC_OPT"
+if [ "$ROCKCFG_POWERPC_ISA" ] ; then
+	var_append GCC_WRAPPER_INSERT " " "-mcpu=$ROCKCFG_POWERPC_ISA"
 fi
 
+if [ "$ROCKCFG_POWERPC_OPT" != "generic" ] ; then
+	var_append GCC_WRAPPER_INSERT " " "-mtune=$ROCKCFG_POWERPC_OPT"
+fi