diff --git a/Makefile.prebuild b/Makefile.prebuild
index daa556f65..a366004a1 100644
--- a/Makefile.prebuild
+++ b/Makefile.prebuild
@@ -17,6 +17,10 @@ ifdef CPUIDEMU
 EXFLAGS = -DCPUIDEMU -DVENDOR=99
 endif
 
+ifeq ($(TARGET), 1004K)
+TARGET_FLAGS = -mips32r2
+endif
+
 ifeq ($(TARGET), P5600)
 TARGET_FLAGS = -mips32r5
 endif
diff --git a/Makefile.system b/Makefile.system
index 142cb420f..fdc408781 100644
--- a/Makefile.system
+++ b/Makefile.system
@@ -564,9 +564,14 @@ CCOMMON_OPT += -march=mips64
 FCOMMON_OPT += -march=mips64
 endif
 
+ifeq ($(CORE), 1004K)
+CCOMMON_OPT += -mips32r2   $(MSA_FLAGS)
+FCOMMON_OPT += -mips32r2   $(MSA_FLAGS)
+endif
+
 ifeq ($(CORE), P5600)
-CCOMMON_OPT += -mips32r5 -mnan=2008 -mtune=p5600 $(MSA_FLAGS)
-FCOMMON_OPT += -mips32r5 -mnan=2008 -mtune=p5600 $(MSA_FLAGS)
+CCOMMON_OPT += -mips32r5   $(MSA_FLAGS)
+FCOMMON_OPT += -mips32r5   $(MSA_FLAGS)
 endif
 
 ifeq ($(CORE), I6400)
diff --git a/param.h b/param.h
index 189cdc4a0..4227d548e 100644
--- a/param.h
+++ b/param.h
@@ -2291,7 +2291,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define SYMV_P	16
 #endif
 
-#if defined(P5600) || defined(I6400) || defined(P6600) || defined(I6500)
+#if defined(P5600) || defined(MIPS1004K) || defined(I6400) || defined(P6600) || defined(I6500)
 #define SNUMOPT  2
 #define DNUMOPT  2