--- contrib/gcc/config/mips/freebsd.h.orig
+++ contrib/gcc/config/mips/freebsd.h
@@ -351,4 +351,5 @@
 #endif
 
 /************************[  Debugger stuff  ]*********************************/
-
+#undef DBX_DEBUGGING_INFO
+#undef MIPS_DEBUGGING_INFO
--- gnu/usr.bin/binutils/as/Makefile.orig
+++ gnu/usr.bin/binutils/as/Makefile
@@ -43,6 +43,13 @@
 
 .if ${TARGET_CPUARCH} == "mips"
 SRCS+=	itbl-ops.c itbl-parse.y itbl-lex.l
+.if ${TARGET_ARCH:Mmips64*} != ""
+CFLAGS+=	-DMIPS_DEFAULT_ABI=N64_ABI -DMIPS_DEFAULT_64BIT=1
+.elif ${TARGET_ARCH:Mmipsn32*} != ""
+CFLAGS+=	-DMIPS_DEFAULT_ABI=N32_ABI
+.else
+MIPS_ABI_DEFAULT=ABI_32
+.endif
 .endif
 
 .if ${TARGET_ARCH} == "amd64"
--- gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h.orig
+++ gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h
@@ -3,14 +3,17 @@
 #include "itbl-mips.h"
 
 /* Choose a default ABI for MIPS targets.  */
-/* XXX: Where should this be ? */
+#ifndef	MIPS_DEFAULT_ABI
 #define MIPS_DEFAULT_ABI NO_ABI
+#endif
 
 /* Default CPU for MIPS targets.  */
 #define MIPS_CPU_STRING_DEFAULT "from-abi"
 
 /* Generate 64-bit code by default on MIPS targets.  */
+#ifndef	MIPS_DEFAULT_64BIT
 #define MIPS_DEFAULT_64BIT 0
+#endif
 
 /* Allow use of E_MIPS_ABI_O32 on MIPS targets.  */
 #define USE_E_MIPS_ABI_O32 1
--- lib/Makefile.orig
+++ lib/Makefile
@@ -179,7 +179,7 @@
 _libypclnt=	libypclnt
 .endif
 
-.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "mips"
 .if ${MK_NCP} != "no"
 _libncp=	libncp
 .endif