diff --git a/sys/conf/Makefile.mips b/sys/conf/Makefile.mips
index 09eca75299ef..30f7d1eccc92 100644
--- a/sys/conf/Makefile.mips
+++ b/sys/conf/Makefile.mips
@@ -42,7 +42,7 @@ TRAMPLOADADDR?=0x807963c0
 # We default to the MIPS32 ISA, if none specified in the
 # kernel configuration file.
 ARCH_FLAGS?=-march=mips32
-EXTRA_FLAGS=-fno-pic -mno-abicalls -G0 -DKERNLOADADDR=${KERNLOADADDR}
+EXTRA_FLAGS=-DKERNLOADADDR=${KERNLOADADDR}
 
 HACK_EXTRA_FLAGS=-shared
 
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 56ddbda4996e..0a8161d06661 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -160,6 +160,7 @@ CFLAGS.gcc+=	-mcall-aixdesc
 # For MIPS we also tell gcc to use floating point emulation
 #
 .if ${MACHINE_CPUARCH} == "mips"
+CFLAGS+=	-fno-pic -mno-abicalls -G0 
 CFLAGS+=	-msoft-float
 INLINE_LIMIT?=	8000
 .endif
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 50000c5e50f2..2b7fab2b5c9d 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -130,7 +130,7 @@ CFLAGS+=	-mlongcall -fno-omit-frame-pointer
 .endif
 
 .if ${MACHINE_CPUARCH} == mips
-CFLAGS+=	-G0 -fno-pic -mno-abicalls -mlong-calls
+CFLAGS+=	-mlong-calls
 .endif
 
 .if defined(DEBUG) || defined(DEBUG_FLAGS)