diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index c05052af6..1d3d5912b 100644
--- a/distrib/sets/lists/minix/mi
+++ b/distrib/sets/lists/minix/mi
@@ -124,9 +124,9 @@
 ./home/ast				minix-sys	obsolete
 ./home/ast/.exrc			minix-sys	obsolete
 ./home/ast/.profile			minix-sys	obsolete
-./home/bin				minix-sys
-./home/bin/.exrc			minix-sys
-./home/bin/.profile			minix-sys
+./home/bin				minix-sys	obsolete
+./home/bin/.exrc			minix-sys	obsolete
+./home/bin/.profile			minix-sys	obsolete
 ./lib					minix-sys
 ./mnt					minix-sys
 ./proc					minix-sys
diff --git a/etc/Makefile b/etc/Makefile
index b5e522353..766ff3762 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -435,7 +435,6 @@ install-etc-files-safe: .PHONY .MAKE check_DESTDIR MAKEDEV
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/devmand/scripts/ ${DESTDIR}/etc/devmand/scripts/ singlechar \
 		${BINOWN} ${BINGRP}	${NONBINMODE}	${NETBSDSRCDIR}/etc/ast/ ${DESTDIR}/usr/ast/ .[aepv]* \
 		${BINOWN} ${BINGRP}	${NONBINMODE}	${NETBSDSRCDIR}/etc/ast/ ${DESTDIR}/root/ .[aepv]* \
-		bin	  ${BINGRP}	${NONBINMODE}	${NETBSDSRCDIR}/etc/ast/ ${DESTDIR}/home/bin/ .[aepv]* \
 
 	${_MKMSG_INSTALL} ${DESTDIR}${tdir}${files:T}
 	if [ ! -e ${tdir} ]; then \
diff --git a/etc/master.passwd b/etc/master.passwd
index 9cf0c81ed..82ce65c4d 100644
--- a/etc/master.passwd
+++ b/etc/master.passwd
@@ -1,6 +1,6 @@
 root::0:0::0:0:Big Brother:/root:/bin/sh
 daemon:*:1:1::0:0:The Deuce:/etc:/bin/sh
-bin:*:2:0::0:0:Binaries:/home/bin:/bin/sh
+bin:*:2:0::0:0:Binaries Commands and Source:/nonexistent:/bin/sh
 uucp:*:5:5::0:0:UNIX to UNIX copy:/usr/spool/uucp:/usr/bin/uucico
 news:*:6:6::0:0:Usenet news:/usr/spool/news:/bin/sh
 ftp:*:7:7::0:0:Anonymous FTP:/usr/ftp:/bin/sh
diff --git a/etc/mtree/NetBSD.dist.base b/etc/mtree/NetBSD.dist.base
index 5bbabd7b0..7d68a01b0 100644
--- a/etc/mtree/NetBSD.dist.base
+++ b/etc/mtree/NetBSD.dist.base
@@ -168,9 +168,6 @@
 ./tmp
 ./usr/tmp
 
-/set type=dir uid=2 gid=0 mode=755
-./home/bin
-
 /set type=dir uid=2 gid=0 mode=755
 ./usr/tests/minix-posix
 ./usr/tests/minix-posix/blocktest
diff --git a/minix/commands/setup/setup.sh b/minix/commands/setup/setup.sh
index ffc62538b..065c8b902 100644
--- a/minix/commands/setup/setup.sh
+++ b/minix/commands/setup/setup.sh
@@ -744,21 +744,6 @@ echo "cddrive=$cddrive" >>/mnt/usr/etc/rc.package
 
 bios="`echo $primary | sed -e 's/d./dX/g' -e 's/c.//g'`"
 
-if [ ! "$auto" = "r" ]
-then	if mount /dev/$home /home 2>/dev/null
-	then	for u in bin
-		do	h=`eval echo "~$u"`
-			if mkdir $h
-			then	echo " * Creating home directory for $u in $h"
-				pax -rw -pe /usr/ast $h
-				chown -R $u:operator $h
-			else	echo " * Couldn't create $h"
-			fi
-		done
-		umount /dev/$home
-	fi
-fi
-
 echo "Saving random data.."
 dd if=/dev/random of=/mnt/usr/adm/random.dat bs=1024 count=1
 
diff --git a/minix/tests/run b/minix/tests/run
index 80d07c16e..86cc90e59 100755
--- a/minix/tests/run
+++ b/minix/tests/run
@@ -111,7 +111,7 @@ runtest() {
 	then
 		if [ $needroot -eq 1 ]
 		then $NAME $ARG || return 1
-		else su - bin -c "cd `pwd`; $NAME $ARG" || return 1
+		else su bin -c "$NAME $ARG" || return 1
 		fi
 	else
 		if [ $needroot -eq 1 ]