diff --git a/share/mk-pic32/local.prog.mk b/share/mk-pic32/local.prog.mk
index 2376a72c..ede07f12 100644
--- a/share/mk-pic32/local.prog.mk
+++ b/share/mk-pic32/local.prog.mk
@@ -21,7 +21,6 @@ LIBCOMPAT?=	/usr/lib/libcompat.a
 LIBCURSES?=	/usr/lib/libcurses.a
 LIBDBM?=	/usr/lib/libdbm.a
 LIBDES?=	/usr/lib/libdes.a
-LIBL?=		/usr/lib/libl.a
 LIBKDB?=	/usr/lib/libkdb.a
 LIBKRB?=	/usr/lib/libkrb.a
 LIBKVM?=	/usr/lib/libkvm.a
diff --git a/sys/mips/conf/Makefile.pic32 b/sys/mips/conf/Makefile.pic32
index f48ef780..3a090e25 100644
--- a/sys/mips/conf/Makefile.pic32
+++ b/sys/mips/conf/Makefile.pic32
@@ -20,11 +20,11 @@
 
 # DEBUG is set to -g by config if debugging is requested (config -g).
 # PROF is set to -pg by config if profiling is requested (config -p).
-AS=	${MIPS_GCC_PREFIX}as ${DEBUG}
-CC=	${MIPS_GCC_PREFIX}gcc ${DEBUG} -fno-builtin
+AS=	${MIPS_GCC_PREFIX}as ${DEBUG} -mips32r2 -EL
+CC=	${MIPS_GCC_PREFIX}gcc ${DEBUG} -mips32r2 -EL -msoft-float -nostdinc -fno-builtin
 LOCALCC= gcc -m32 ${DEBUG}
 CPP=	cpp
-LD=	${MIPS_GCC_PREFIX}gcc
+LD=	${MIPS_GCC_PREFIX}gcc -mips32r2 -EL
 LDFLAGS= -nostdlib -T $A/pic32/bootloader-max32.ld -Wl,-Map=unix.map
 SIZE=	${MIPS_GCC_PREFIX}size
 
@@ -71,7 +71,7 @@ SYSTEM_LD_TAIL=	${SIZE} $@
 %LOAD
 
 $S/libkern/libkern.a:
-	${MAKE} -C $S/libkern all
+	cd $S/libkern && ${MAKE} all
 
 newvers:
 	sh $S/conf/newvers.sh
diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c
index 67a2f5ba..05988505 100644
--- a/usr.sbin/config/mkioconf.c
+++ b/usr.sbin/config/mkioconf.c
@@ -1100,7 +1100,7 @@ void comp_config(fp)
 			dp->d_unit, dp->d_pri < 0 ? 0 : dp->d_pri,
 			dp->d_flags, 1);
 		for (fl = fl->f_next; fl->f_type == COMPSPEC; fl = fl->f_next)
-			fprintf(fp, " 0x%x,", fl->f_compdev);
+			fprintf(fp, " 0x%x,", (unsigned) fl->f_compdev);
 		fprintf(fp, " NODEV },\n");
 	}
 	fprintf(fp, "\t-1,\t0,\t0,\t0,\t{ 0 },\n};\n");