diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf
index 1ae6cde1f..1b20caa4e 100644
--- a/package/base/linux/linux.conf
+++ b/package/base/linux/linux.conf
@@ -77,26 +77,21 @@ lx_kernelrelease=""
 
 if [ -z "$pkg_linux_cross" ]
 then
-	lx_cpu=$( echo "$arch_machine" | \
-		sed -e s/x86$/i386/                      \
-		    -e s/hppa/parisc/ -e s/i.86/i386/    \
-		    -e s/sun4u/sparc64/ -e s/arm.*/arm/  \
-		    -e s/sa110/arm/ -e s/s390x/s390/     \
-		    -e s/parisc64/parisc/ )
-
+	lx_cpu="$arch_machine"
 	if [ $arch = sparc -a "$ROCKCFG_SPARC_64BIT_KERNEL" = 1 ] ; then
-		lx_cpu=sparc64 ; 
+		lx_cpu=sparc64
 		KCC=sparc64-unknown-linux-gnu-gcc
 		archprefix=sparc64-unknown-linux-gnu-
 	fi
 else
-	lx_cpu=$( echo "$pkg_linux_cross" | \
+	lx_cpu="$pkg_linux_cross"
+fi
+lx_cpu=$( echo "$lx_cpu" | \
 		sed -e s/x86$/i386/                      \
 		    -e s/hppa/parisc/ -e s/i.86/i386/    \
 		    -e s/sun4u/sparc64/ -e s/arm.*/arm/  \
 		    -e s/sa110/arm/ -e s/s390x/s390/     \
 		    -e s/mips.*/mips/ -e s/parisc64/parisc/ )
-fi
 
 case "$lx_cpu" in
 	i386)