diff --git a/architecture/arm/config.in b/architecture/arm/config.in
index b559dc137..ec2f43bc5 100644
--- a/architecture/arm/config.in
+++ b/architecture/arm/config.in
@@ -21,8 +21,8 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 choice ROCKCFG_ARM_ENDIANESS EL \
-	EB	"build for big endian machines"	\
-	EL	"build for little endian machines"
+	EB	"Build for big endian machines"	\
+	EL	"Build for little endian machines"
 
 ROCKCFG_ID="$ROCKCFG_ID-$ROCKCFG_ARM_ENDIANESS"
 
diff --git a/architecture/arm/preconfig.in b/architecture/arm/preconfig.in
index d0c894992..dfc9387a7 100644
--- a/architecture/arm/preconfig.in
+++ b/architecture/arm/preconfig.in
@@ -21,3 +21,4 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 CFGTEMP_ARCHLIST="$CFGTEMP_ARCHLIST arm Generic_ARM_Machines_(EXPERIMENTAL)"
+
diff --git a/architecture/hppa/config.in b/architecture/hppa/config.in
index 64659c4e6..29a61cf3c 100644
--- a/architecture/hppa/config.in
+++ b/architecture/hppa/config.in
@@ -24,8 +24,8 @@
 
 # General architecture switch
 choice ROCKCFG_HPPA_BITS 32 \
-	32	"build 32 bit code"	\
-	64	"build 64 bit code"
+	32	"Build 32 bit code"	\
+	64	"Build 64 bit code"
 
 # Now the optimisations that result from the options above
 choice ROCKCFG_HPPA_OPT generic   \
diff --git a/architecture/hppa/preconfig.in b/architecture/hppa/preconfig.in
index cd22c69de..6e43fd373 100644
--- a/architecture/hppa/preconfig.in
+++ b/architecture/hppa/preconfig.in
@@ -20,5 +20,5 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-CFGTEMP_ARCHLIST="$CFGTEMP_ARCHLIST hppa Generic_HPPA_Workstations"
+CFGTEMP_ARCHLIST="$CFGTEMP_ARCHLIST hppa Generic_HPPA_Workstations_(EXPERIMENTAL)"
 
diff --git a/architecture/mips/config.in b/architecture/mips/config.in
index cabe8ea0d..280b607a7 100644
--- a/architecture/mips/config.in
+++ b/architecture/mips/config.in
@@ -21,8 +21,8 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 choice ROCKCFG_MIPS_ENDIANESS EB \
-	EB	"build for big endian machines"	\
-	EL	"build for little endian machines"
+	EB	"Build for big endian machines"	\
+	EL	"Build for little endian machines"
 
 ROCKCFG_ID="$ROCKCFG_ID-$ROCKCFG_MIPS_ENDIANESS"
 
diff --git a/architecture/sparc/config.in b/architecture/sparc/config.in
index 236c905e1..3b47303c0 100644
--- a/architecture/sparc/config.in
+++ b/architecture/sparc/config.in
@@ -24,8 +24,8 @@
 
 # General architecture switch
 choice ROCKCFG_SPARC_BITS 32 \
-	32	"build 32 bit user-space SPARC (v7 and above)"	\
-	64	"build 64 bit user-space SPARC (v9 - Ultra SPARC) (EXPERIMENTAL)"
+	32	"Build 32 bit user-space SPARC (v7 and above)"	\
+	64	"Build 64 bit user-space SPARC (v9 - Ultra SPARC) (EXPERIMENTAL)"
 
 # Some architecture special switches
 if [ "$ROCKCFG_SPARC_BITS" = 32 ] ; then
diff --git a/architecture/x86/config.in b/architecture/x86/config.in
index 3b50aa433..f4079ab27 100644
--- a/architecture/x86/config.in
+++ b/architecture/x86/config.in
@@ -22,8 +22,8 @@
 
 # General architecture switch
 choice ROCKCFG_X86_BITS 32 \
-	32      "build 32 bit (normal x86)"  \
-	64      "build 64 bit (AMD 64 - Opteron)"
+	32      "Build 32 bit (normal x86)"  \
+	64      "Build 64 bit (AMD 64 - Opteron)"
 
 
 if [ "$ROCKCFG_X86_BITS" = 32 ] ; then