diff --git a/boards/mips-malta/Makefile.include b/boards/mips-malta/Makefile.include
index 7007f50e07abe6b85e153ce2f32081b3e9b08d53..d79deb16a0fba8cd306e8a5893d151ce52c79369 100644
--- a/boards/mips-malta/Makefile.include
+++ b/boards/mips-malta/Makefile.include
@@ -1,4 +1,4 @@
-export CPU = mips32r2_common
+export CPU = mips32r2_generic
 export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/
 #export USE_HARD_FLOAT = 1
 export USE_DSP = 1
diff --git a/cpu/mips32r2_generic/Makefile b/cpu/mips32r2_generic/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..daf75bfdb8ac24a526a03d52b7b50d1ae0859c48
--- /dev/null
+++ b/cpu/mips32r2_generic/Makefile
@@ -0,0 +1,5 @@
+MODULE = cpu
+
+DIRS += $(RIOTCPU)/mips32r2_common
+
+include $(RIOTBASE)/Makefile.base
diff --git a/cpu/mips32r2_generic/Makefile.features b/cpu/mips32r2_generic/Makefile.features
new file mode 100644
index 0000000000000000000000000000000000000000..df468eb83826afd45a2b077ca9deb83f4070c15d
--- /dev/null
+++ b/cpu/mips32r2_generic/Makefile.features
@@ -0,0 +1 @@
+-include $(RIOTCPU)/mips32r2_common/Makefile.features
diff --git a/cpu/mips32r2_generic/Makefile.include b/cpu/mips32r2_generic/Makefile.include
new file mode 100644
index 0000000000000000000000000000000000000000..d3df4a298bba4df94cdf7db0450b90b5aec5fe0d
--- /dev/null
+++ b/cpu/mips32r2_generic/Makefile.include
@@ -0,0 +1,21 @@
+export MEMORY_BASE=0x80000000
+export MEMORY_SIZE=1M
+export APP_START=0x80000000
+
+include $(RIOTMAKE)/arch/mips.inc.mk
+
+export USEMODULE += periph
+export USEMODULE += periph_common
+export USEMODULE += newlib
+
+export USEMODULE += periph_timer
+
+ifeq ($(USE_UHI_SYSCALLS),1)
+  #Use UHI to handle syscalls
+  export LINKFLAGS += -luhi -Tuhi32.ld
+  export USEMODULE += newlib_syscalls_mips_uhi
+else
+  #Use RIOT to handle syscalls (default)
+  export LINKFLAGS += -Tuhi32.ld
+  export USEMODULE += newlib_syscalls_default
+endif
diff --git a/cpu/mips32r2_common/include/cpu.h b/cpu/mips32r2_generic/include/cpu.h
similarity index 92%
rename from cpu/mips32r2_common/include/cpu.h
rename to cpu/mips32r2_generic/include/cpu.h
index b4bf80a907d835e2b5bed104f419c7589c9c06d1..6c039938ff2c88d896fd74f477d11bd7c40bc224 100644
--- a/cpu/mips32r2_common/include/cpu.h
+++ b/cpu/mips32r2_generic/include/cpu.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @defgroup    cpu_mips32r2_commom Imagination Technologies MIPS32R2 Common
+ * @defgroup    cpu_mips32r2_generic Imagination Technologies MIPS32R2 Common
  * @ingroup     cpu
  * @brief       Imagination Technologies MIPS32R2 common
  * @{
diff --git a/cpu/mips32r2_common/include/cpu_conf.h b/cpu/mips32r2_generic/include/cpu_conf.h
similarity index 97%
rename from cpu/mips32r2_common/include/cpu_conf.h
rename to cpu/mips32r2_generic/include/cpu_conf.h
index 54ed0671b0167602138adc9f771c553e15f52e37..4349f2ec8436095bb3ce8f42c73e294118935b46 100644
--- a/cpu/mips32r2_common/include/cpu_conf.h
+++ b/cpu/mips32r2_generic/include/cpu_conf.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     cpu_mips32r2_commom
+ * @ingroup     cpu_mips32r2_generic
  * @{
  *
  * @file
diff --git a/cpu/mips32r2_common/include/periph_cpu.h b/cpu/mips32r2_generic/include/periph_cpu.h
similarity index 79%
rename from cpu/mips32r2_common/include/periph_cpu.h
rename to cpu/mips32r2_generic/include/periph_cpu.h
index 776aabe808e79a8a70faa74c9e684e1c8d16266b..d952154e7584713551e489672d11129a03b0ed83 100644
--- a/cpu/mips32r2_common/include/periph_cpu.h
+++ b/cpu/mips32r2_generic/include/periph_cpu.h
@@ -10,12 +10,6 @@
 
 /* No peripherals I/O via JTAG or Bootloader using UHI */
 
-/*
- * Note mips32r2_common can be selected in its own right as a CPU
- * for testing on PFGA systems (like BOARD=mips-malta) with limited
- * or no peripherals
- */
-
 #ifndef PERIPH_CPU_H
 #define PERIPH_CPU_H