diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 69bfc2f40e..33fdd2a61a 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -42,6 +42,11 @@ config ARCH_MIPS_24KC
 config ARCH_MIPS_M14K
 	bool
 	default n
+	select ARCH_MIPS_MICROMIPS
+
+config ARCH_MIPS_MICROMIPS
+	bool
+	default n
 
 config ARCH_FAMILY
 	string
diff --git a/arch/mips/src/mips32/up_syscall0.S b/arch/mips/src/mips32/up_syscall0.S
index 0a82cd3466..f9cf4762bf 100644
--- a/arch/mips/src/mips32/up_syscall0.S
+++ b/arch/mips/src/mips32/up_syscall0.S
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/mips/src/mips32/up_syscall0.S
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -80,7 +80,12 @@
 
 	.text
 	.set	noreorder
+	.set	nomips16
+#ifdef CONFIG_ARCH_MIPS_MICROMIPS
+	.set	micromips
+#endif
 	.ent	sys_call0
+
 sys_call0:	/* r4 holds the syscall number */
 sys_call1:	/* r4 holds the syscall number, argument in r5 */
 sys_call2:	/* r4 holds the syscall number, arguments in r5 and r6 */
diff --git a/arch/mips/src/mips32/vfork.S b/arch/mips/src/mips32/vfork.S
index 8aba773263..1e000b78d0 100644
--- a/arch/mips/src/mips32/vfork.S
+++ b/arch/mips/src/mips32/vfork.S
@@ -1,7 +1,7 @@
 /************************************************************************************
  * arch/mips/src/mips32/vfork.S
  *
- *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -102,6 +102,9 @@
 	.globl	vfork
 	.type	vfork, function
 	.set	nomips16
+#ifdef CONFIG_ARCH_MIPS_MICROMIPS
+	.set	micromips
+#endif
 	.ent	vfork
 
 vfork: