diff --git a/commands/Makefile b/commands/Makefile
index b0c66f9ed..03de65826 100644
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -11,13 +11,13 @@ SUBDIR=	aal add_route adduser advent arp ash at autil awk \
 	dd de decomp16 DESCRIBE dev2name devsize df dhcpd \
 	dhrystone diff dirname dis88 du dumpcore easypack \
 	ed eject elle elvis env expand factor file \
-	find finger fingerd fix fold format fortune fsck \
+	find finger fingerd fix fold format fortune fsck.mfs \
 	fsck1 ftp101 ftpd200 getty grep gomoku head host \
 	hostaddr id ifconfig ifdef indent install \
 	intr ipcrm ipcs irdpd isoread join kill last leave \
 	less lex life loadkeys loadramdisk logger login look lp \
 	lpd ls lspci M m4 mail make  MAKEDEV man \
-	mdb mdocml mesg mined mkdep mkdir mkdist mkfifo mkfs mknod \
+	mdb mdocml mesg mined mkdep mkdir mkdist mkfifo mkfs.mfs mknod \
 	mkproto modem mount mt netconf newroot nice acknm nohup \
 	nonamed od packit packman passwd paste patch pax \
 	ping postinstall poweroff pr prep printf printroot \
diff --git a/commands/fsck/Makefile b/commands/fsck.mfs/Makefile
similarity index 60%
rename from commands/fsck/Makefile
rename to commands/fsck.mfs/Makefile
index 4311013e5..33e033fe0 100644
--- a/commands/fsck/Makefile
+++ b/commands/fsck.mfs/Makefile
@@ -1,6 +1,7 @@
-PROG=	fsck
+PROG=	fsck.mfs
+SRCS=	fsck.c
 CPPFLAGS+= -I${MINIXSRCDIR}/servers
-BINDIR=	/bin
+BINDIR=	/sbin
 MAN=
 
 .include <bsd.prog.mk>
diff --git a/commands/fsck/fsck.c b/commands/fsck.mfs/fsck.c
similarity index 100%
rename from commands/fsck/fsck.c
rename to commands/fsck.mfs/fsck.c
diff --git a/commands/mkfs/Makefile b/commands/mkfs.mfs/Makefile
similarity index 60%
rename from commands/mkfs/Makefile
rename to commands/mkfs.mfs/Makefile
index c688a17fa..c4614af11 100644
--- a/commands/mkfs/Makefile
+++ b/commands/mkfs.mfs/Makefile
@@ -1,4 +1,6 @@
-PROG=	mkfs
+PROG=	mkfs.mfs
+SRCS=	mkfs.c
+BINDIR=	/sbin
 CPPFLAGS+= -I${MINIXSRCDIR}/servers
 MAN=
 
diff --git a/commands/mkfs/mkfs.c b/commands/mkfs.mfs/mkfs.c
similarity index 100%
rename from commands/mkfs/mkfs.c
rename to commands/mkfs.mfs/mkfs.c
diff --git a/commands/setup/setup.sh b/commands/setup/setup.sh
index 4c7abdad0..280d78109 100644
--- a/commands/setup/setup.sh
+++ b/commands/setup/setup.sh
@@ -44,7 +44,7 @@ then
 	exit 1
 fi
 
-PATH=/bin:/usr/bin
+PATH=/bin:/sbin:/usr/bin
 export PATH
 
 
@@ -453,19 +453,19 @@ installboot -m /dev/$primary /usr/mdec/masterboot >/dev/null || exit
 partition /dev/$primary 1 81:${ROOTSECTS}* 81:$homesize 81:0+ > /dev/null || exit
 
 echo "Creating /dev/$root for / .."
-mkfs /dev/$root || exit
+mkfs.mfs /dev/$root || exit
 
 if [ "$nohome" = 0 ]
 then
 	if [ ! "$auto" = r ]
 	then	echo "Creating /dev/$home for /home .."
-		mkfs -B $blocksizebytes /dev/$home || exit
+		mkfs.mfs -B $blocksizebytes /dev/$home || exit
 	fi
 else	echo "Skipping /home"
 fi
 
 echo "Creating /dev/$usr for /usr .."
-mkfs -B $blocksizebytes /dev/$usr || exit
+mkfs.mfs -B $blocksizebytes /dev/$usr || exit
 
 if [ "$nohome" = 0 ]
 then
diff --git a/drivers/ramdisk/Makefile b/drivers/ramdisk/Makefile
index c4d7bd3db..4bdecef3d 100644
--- a/drivers/ramdisk/Makefile
+++ b/drivers/ramdisk/Makefile
@@ -23,7 +23,7 @@ bintoc:	bintoc.c
 	$(CC) -o $@ bintoc.c
 
 image:	proto.gen mtab rc $(PROGRAMS) $(EXTRA)
-	mkfs image proto.gen || { rm -f image; false; }
+	mkfs.mfs image proto.gen || { rm -f image; false; }
 
 at_wini: ../at_wini/at_wini
 	install -s ../$@/$@ $@
diff --git a/etc/ast/.ashrc b/etc/ast/.ashrc
index 5ccacaf2e..ab18d091a 100644
--- a/etc/ast/.ashrc
+++ b/etc/ast/.ashrc
@@ -7,7 +7,7 @@ umask 022
 # Favourite editor and pager, search path for binaries, etc.
 export EDITOR=vi
 export PAGER=more
-export PATH=$HOME/bin:/usr/local/bin:/bin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/pkg/bin:/usr/pkg/sbin:/usr/llvm/bin
+export PATH=$HOME/bin:/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/pkg/bin:/usr/pkg/sbin:/usr/llvm/bin
 
 } # End of no-repeat.
 
diff --git a/etc/rc b/etc/rc
index 88a9b548d..700e166b4 100755
--- a/etc/rc
+++ b/etc/rc
@@ -161,13 +161,13 @@ Mount $usr /usr failed -- Single user."
     if [ "$fflag" ]
     then
 	umount $usr
-	echo "fsck / - $root"
-	intr fsck $fsckopts $root
-	echo "fsck /usr - $usr"
-	intr fsck $fsckopts $usr
+	echo "fsck.mfs / - $root"
+	intr fsck.mfs $fsckopts $root
+	echo "fsck.mfs /usr - $usr"
+	intr fsck.mfs $fsckopts $usr
 	if [ ! -z "$home" ]
-	then	echo "fsck /home - $home"
-		intr fsck $fsckopts $home
+	then	echo "fsck.mfs /home - $home"
+		intr fsck.mfs $fsckopts $home
 	fi
 	mount $bin_img $usr /usr
     fi
diff --git a/tools/release.sh b/tools/release.sh
index ee1fe5f2e..c86a88249 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -148,7 +148,7 @@ fitfs()
 
 	# Create a filesystem on the target ramdisk
 	ramdisk $kbs $ramdisk
-	mkfs -B $BS -i $inodes $ramdisk
+	mkfs.mfs -B $BS -i $inodes $ramdisk
 }
 
 RELEASEDIR=/usr/r-staging
@@ -268,7 +268,7 @@ mkdir -p $RELEASEPACKAGE
 mkdir -p $RELEASEPACKAGESOURCES
 
 echo " * Transfering bootstrap dirs to $RELEASEDIR"
-cp -p /bin/* /usr/bin/* $RELEASEDIR/$XBIN
+cp -p /bin/* /usr/bin/* /sbin/* $RELEASEDIR/$XBIN
 cp -rp /usr/lib $RELEASEDIR/usr
 cp -rp /bin/sh /bin/echo $RELEASEDIR/bin
 cp -rp /usr/bin/make /usr/bin/install /usr/bin/yacc /usr/bin/lex /usr/bin/asmconv $RELEASEDIR/usr/bin