diff --git a/config/opal_config_asm.m4 b/config/opal_config_asm.m4
index 9b3f3f666f..686291402c 100644
--- a/config/opal_config_asm.m4
+++ b/config/opal_config_asm.m4
@@ -1234,14 +1234,6 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
               [AC_MSG_ERROR([No atomic primitives available for $host])])
             ;;
 
-        mips-*|mips64*)
-            # Should really find some way to make sure that we are on
-            # a MIPS III machine (r4000 and later)
-            opal_cv_asm_arch="MIPS"
-            OPAL_CHECK_SYNC_BUILTINS([opal_cv_asm_builtin="BUILTIN_SYNC"],
-              [AC_MSG_ERROR([No atomic primitives available for $host])])
-            ;;
-
         powerpc-*|powerpc64-*|powerpcle-*|powerpc64le-*|rs6000-*|ppc-*)
             OPAL_CHECK_POWERPC_REG
             if test "$ac_cv_sizeof_long" = "4" ; then
diff --git a/opal/include/opal/sys/architecture.h b/opal/include/opal/sys/architecture.h
index 4df91bed42..d3cd8d0856 100644
--- a/opal/include/opal/sys/architecture.h
+++ b/opal/include/opal/sys/architecture.h
@@ -40,7 +40,6 @@
 #define OPAL_SPARC          0060
 #define OPAL_SPARCV9_32     0061
 #define OPAL_SPARCV9_64     0062
-#define OPAL_MIPS           0070
 #define OPAL_ARM            0100
 #define OPAL_ARM64          0101
 #define OPAL_BUILTIN_SYNC   0200
diff --git a/opal/include/opal/sys/atomic.h b/opal/include/opal/sys/atomic.h
index cf0115622e..b52b911421 100644
--- a/opal/include/opal/sys/atomic.h
+++ b/opal/include/opal/sys/atomic.h
@@ -177,8 +177,6 @@ enum {
 #include "opal/sys/ia32/atomic.h"
 #elif OPAL_ASSEMBLY_ARCH == OPAL_IA64
 #include "opal/sys/ia64/atomic.h"
-#elif OPAL_ASSEMBLY_ARCH == OPAL_MIPS
-#include "opal/sys/mips/atomic.h"
 #elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC32
 #include "opal/sys/powerpc/atomic.h"
 #elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC64
diff --git a/opal/include/opal/sys/cma.h b/opal/include/opal/sys/cma.h
index 50c8a3956e..d994537bb2 100644
--- a/opal/include/opal/sys/cma.h
+++ b/opal/include/opal/sys/cma.h
@@ -65,24 +65,6 @@
 #define __NR_process_vm_readv 270
 #define __NR_process_vm_writev 271
 
-#elif OPAL_ASSEMBLY_ARCH == OPAL_MIPS
-
-#if _MIPS_SIM == _MIPS_SIM_ABI64
-
-#define __NR_process_vm_readv 5304
-#define __NR_process_vm_writev 5305
-
-#elif _MIPS_SIM == _MIPS_SIM_NABI32
-
-#define __NR_process_vm_readv 6309
-#define __NR_process_vm_writev 6310
-
-#else
-
-#error "Unsupported MIPS architecture for process_vm_readv and process_vm_writev syscalls"
-
-#endif
-
 #else
 #error "Unsupported architecture for process_vm_readv and process_vm_writev syscalls"
 #endif