diff --git a/architecture/x86/config.in b/architecture/x86/config.in
index d0b66827c..3b50aa433 100644
--- a/architecture/x86/config.in
+++ b/architecture/x86/config.in
@@ -31,6 +31,8 @@ if [ "$ROCKCFG_X86_BITS" = 32 ] ; then
 	generic		"No special optimisation"		\
 	i386		"Optimised for Intel 386"		\
 	i486		"Optimised for Intel 486"		\
+	via-c3		"Optimised for VIA CyrixIII/VIA-C3"	\
+	via-c3-2	"Optimised for VIA-C3-2 Nemiah"		\
 	pentium		"Optimised for Intel Pentium"		\
 	pentium-mmx	"Optimised for Intel Pentium with MMX"	\
 	pentiumpro	"Optimised for Intel Pentium-Pro"	\
diff --git a/architecture/x86/gcc-options b/architecture/x86/gcc-options
index 54de75306..61da7ebc8 100644
--- a/architecture/x86/gcc-options
+++ b/architecture/x86/gcc-options
@@ -1,7 +1,13 @@
 
-if [ "$ROCKCFG_X86_OPT" != "generic" ] ; then
-	var_append GCC3_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT"
-fi
+case "$ROCKCFG_X86_OPT" in
+    generic) ;;
+    via-c3)
+	var_append GCC3_WRAPPER_INSERT " " "-march=k62" ;;
+    via-c3-2)
+	var_append GCC3_WRAPPER_INSERT " " "-march=pentium-mmx" ;;
+    *)
+	var_append GCC3_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT" ;;
+esac
 
 case "$ROCKCFG_X86_OPT" in
     i386|i486)
@@ -10,10 +16,10 @@ case "$ROCKCFG_X86_OPT" in
     pentium|pentium-mmx)
 	var_append GCC2_WRAPPER_INSERT " " "-march=pentium" ;;
     
-    pentium*)
+    pentium*|via-c3-2)
 	var_append GCC2_WRAPPER_INSERT " " "-march=pentiumpro" ;;
 
-    k6*|athlon*)
+    k6*|athlon*|via-c3)
 	var_append GCC2_WRAPPER_INSERT " " "-march=k6" ;;
 esac
 
diff --git a/architecture/x86/kernel.conf.sh b/architecture/x86/kernel.conf.sh
index fef0488a0..c8d35937e 100644
--- a/architecture/x86/kernel.conf.sh
+++ b/architecture/x86/kernel.conf.sh
@@ -10,6 +10,8 @@
 	linux_arch=386
 	for x in "i386		386"		\
 		 "i486		486"		\
+		 "via-c3	MCYRIXIII"	\
+		 "via-c3-2	MVIAC3_2"	\
 		 "pentium	586"		\
 		 "pentium-mmx	586MMX"		\
 		 "pentiumpro	686"		\