diff --git a/architecture/mips/kernel.conf.m4 b/architecture/mips/kernel.conf.m4
deleted file mode 100644
index 51b5a67eb..000000000
--- a/architecture/mips/kernel.conf.m4
+++ /dev/null
@@ -1,9 +0,0 @@
-define(`MIPS', `MIPS')dnl
-
-CONFIG_MIPS=y
-CONFIG_MIPS32=y
-
-include(`kernel-common.conf')
-include(`kernel-scsi.conf')
-include(`kernel-net.conf')
-include(`kernel-fs.conf')
diff --git a/architecture/mips/kernel.conf.sh b/architecture/mips/kernel.conf.sh
new file mode 100644
index 000000000..77eaf25d7
--- /dev/null
+++ b/architecture/mips/kernel.conf.sh
@@ -0,0 +1,32 @@
+
+{
+	cat <<- 'EOT'
+		define(`MIPS', `MIPS')dnl
+
+		CONFIG_MIPS=y
+	EOT
+
+	if [ "$ROCKCFG_MIPS_ABI" = "32" ] ; then
+		cat <<- 'EOT'
+			CONFIG_MIPS32=y
+		EOT
+	else
+		cat <<- 'EOT'
+			CONFIG_MIPS64=y
+		EOT
+	fi
+
+	if [ "$ROCKCFG_MIPS_ENDIANESS" = "EL" ] ; then
+		cat <<- 'EOT'
+			CONFIG_CPU_LITTLE_ENDIAN=y
+		EOT
+	fi
+
+	cat <<- 'EOT'
+		include(`kernel-common.conf')
+		include(`kernel-scsi.conf')
+		include(`kernel-net.conf')
+		include(`kernel-fs.conf')
+	EOT
+
+} | m4 -I $base/architecture/$arch -I $base/architecture/share 
diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf
index 5efe22ff3..178207dd7 100644
--- a/package/base/linux/linux.conf
+++ b/package/base/linux/linux.conf
@@ -72,7 +72,7 @@ else
 		    -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/ )
+		    -e s/mips.*/mips/ -e s/parisc64/parisc/ )
 fi
 
 MAKE="$MAKE ARCH=$lx_cpu CROSS_COMPILE=$archprefix KCC=$KCC"