diff --git a/release/amd64/boot_crunch.conf b/release/amd64/boot_crunch.conf
index 8c126a7d34ff..f2d39dd14029 100644
--- a/release/amd64/boot_crunch.conf
+++ b/release/amd64/boot_crunch.conf
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-buildopts -DRELEASE_CRUNCH
+buildopts -DRELEASE_CRUNCH -Dlint
 
 srcdirs /usr/src/bin
 progs hostname pwd rm sh test
@@ -14,7 +14,6 @@ srcdirs /usr/src/sbin
 progs dhclient fsck fsck_4.2bsd ifconfig
 progs mount_nfs newfs route rtsol
 progs slattach tunefs
-ln newfs mount_mfs
 
 srcdirs /usr/src/usr.bin
 progs find minigzip sed
@@ -27,4 +26,4 @@ progs arp pccardc pccardd ppp
 progs sysinstall usbd usbdevs
 
 libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz -lnetgraph
-libs -ldialog -lncurses -ldisk -lipx
+libs -ldialog -lncurses -ldisk
diff --git a/release/i386/boot_crunch.conf b/release/i386/boot_crunch.conf
index 8c126a7d34ff..f2d39dd14029 100644
--- a/release/i386/boot_crunch.conf
+++ b/release/i386/boot_crunch.conf
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-buildopts -DRELEASE_CRUNCH
+buildopts -DRELEASE_CRUNCH -Dlint
 
 srcdirs /usr/src/bin
 progs hostname pwd rm sh test
@@ -14,7 +14,6 @@ srcdirs /usr/src/sbin
 progs dhclient fsck fsck_4.2bsd ifconfig
 progs mount_nfs newfs route rtsol
 progs slattach tunefs
-ln newfs mount_mfs
 
 srcdirs /usr/src/usr.bin
 progs find minigzip sed
@@ -27,4 +26,4 @@ progs arp pccardc pccardd ppp
 progs sysinstall usbd usbdevs
 
 libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz -lnetgraph
-libs -ldialog -lncurses -ldisk -lipx
+libs -ldialog -lncurses -ldisk