diff --git a/sys/mips/conf/MALTA b/sys/mips/conf/MALTA
index d4ce4461651d..1d65cfc3a08d 100644
--- a/sys/mips/conf/MALTA
+++ b/sys/mips/conf/MALTA
@@ -21,6 +21,7 @@ ident		MALTA
 
 #makeoptions	ARCH_FLAGS=-march=mips32
 makeoptions	MIPS_LITTLE_ENDIAN=defined
+makeoptions	KERNLOADADDR=0x80100000
 
 options 	YAMON
 
@@ -33,6 +34,8 @@ options 	TICK_USE_YAMON_FREQ=defined
 
 include		"../malta/std.malta"
 
+options		ISA_MIPS32
+
 hints		"MALTA.hints"		#Default places to look for devices.
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
diff --git a/sys/mips/conf/SENTRY5 b/sys/mips/conf/SENTRY5
index bc2438a7228e..c035350cb15e 100644
--- a/sys/mips/conf/SENTRY5
+++ b/sys/mips/conf/SENTRY5
@@ -26,9 +26,8 @@
 
 ident		SENTRY5
 cpu		CPU_MIPS4KC
-options 	CPU_NOFPU
 options 	ISA_MIPS32
-options 	CPU_SENTRY5			# XXX should this be a
+options		CPU_SENTRY5			# XXX should this be a
 						# sub-cpu option?
 
 # XXX only siba should be hardwired for now; we will use
@@ -37,50 +36,43 @@ files		"../sentry5/files.sentry5"
 hints		"SENTRY5.hints"
 
 # sentry5 normally ships with cfe firmware; use the console for now
-options 	CFE
-options 	CFE_CONSOLE
-options 	ALT_BREAK_TO_DEBUGGER
-
-# cfe loader expects kernel at 0x80001000 for mips32 w/o backwards
-# offsets in the linked elf image (see ldscript hack)
-# XXX can we conditionalize the linker stuff on options CFE?
-options 	KERNVIRTADDR=0x80001000
-
-makeoptions	LDSCRIPT_NAME=	ldscript.mips.cfe
+options		CFE
+options		CFE_CONSOLE
+options		ALT_BREAK_TO_DEBUGGER
 
 #makeoptions	ARCH_FLAGS=-march=mips32
 makeoptions	MIPS_LITTLE_ENDIAN=defined
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	MODULES_OVERRIDE=""
 
-options 	DDB
-options 	KDB
+options		DDB
+options		KDB
 
-options 	SCHED_4BSD		#4BSD scheduler
-options 	INET			#InterNETworking
-options 	NFSCLIENT		#Network Filesystem Client
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
-options 	PSEUDOFS		#Pseudo-filesystem framework
-options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options		SCHED_4BSD		#4BSD scheduler
+options		INET			#InterNETworking
+options		NFSCLIENT		#Network Filesystem Client
+options		NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options		PSEUDOFS		#Pseudo-filesystem framework
+options		_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 
 # Debugging for use in -current
-options 	INVARIANTS
-options 	INVARIANT_SUPPORT
+options		INVARIANTS
+options		INVARIANT_SUPPORT
 
-#options 	BUS_DEBUG
+#options		BUS_DEBUG
 #makeoptions	BUS_DEBUG
 
 device		siba			# Sonics SiliconBackplane
 device		pci			# siba_pcib
 
-device		bfe			# XXX will build both pci and siba
-device		miibus			# attachments
+# device		bfe			# XXX will build both pci and siba
+# device		miibus			# attachments
 
 # pci devices
 # notyet:
 #device		ath			# in pci slot
 #device		ath_hal			# pci chip support
-#options 	AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
+#options		AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
 
 device		usb			# USB Bus (required)
 device		uhci			# UHCI PCI->USB interface