diff --git a/releasetools/netbsd2minix/applywhitelist.sh b/releasetools/netbsd2minix/applywhitelist.sh
index b6dbfda4c..e119da241 100755
--- a/releasetools/netbsd2minix/applywhitelist.sh
+++ b/releasetools/netbsd2minix/applywhitelist.sh
@@ -1,8 +1,10 @@
 #!/bin/sh
-. ./releasetools/netbsd2minix/common.sh
 # Assume $1 is whitelist working directory
 cd $1
-while read $dir
+mkdir -p $SRC/$1
+while read dir
 do
-	cp -rf $dir $SRC
+	cp -rf $dir $SRC/$1
 done
+
+cd $MINIX
diff --git a/releasetools/netbsd2minix/common.sh b/releasetools/netbsd2minix/common.sh
deleted file mode 100644
index 487d7df88..000000000
--- a/releasetools/netbsd2minix/common.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Current source tree
-MINIX=.
-# NetBSD2Minix folder
-N2M=$MINIX/releasetools/netbsd2minix
-# NetBSD source tree
-NETBSD=$N2M/netbsd
-# New source tree
-SRC=$N2M/src
diff --git a/releasetools/netbsd2minix/run.sh b/releasetools/netbsd2minix/run.sh
index 1db184cb6..ea379a6b6 100755
--- a/releasetools/netbsd2minix/run.sh
+++ b/releasetools/netbsd2minix/run.sh
@@ -1,11 +1,21 @@
 #!/bin/sh
-. releasetools/netbsd2minix/common.sh
+
+# Current source tree
+MINIX=`pwd`
+# NetBSD2Minix folder
+N2M=$MINIX/releasetools/netbsd2minix
+# NetBSD source tree
+NETBSD=$N2M/netbsd
+# New source tree
+SRC=$N2M/src
+
+export MINIX N2M NETBSD SRC
+
+
 $N2M/setupnetbsd.sh
+mkdir -p $SRC
+rm -rf $SRC/*
 $N2M/whitelists.sh
-$N2M/setupminix.sh
 cd $SRC
-if [ `uname` -eq Minix ]
-then
-	make build
-else
-	./build.sh -m i386 build
+
+./build.sh -m i386 build
diff --git a/releasetools/netbsd2minix/setupnetbsd.sh b/releasetools/netbsd2minix/setupnetbsd.sh
index 07c7f84e2..8cf2eac89 100755
--- a/releasetools/netbsd2minix/setupnetbsd.sh
+++ b/releasetools/netbsd2minix/setupnetbsd.sh
@@ -1,3 +1,2 @@
-. releasetools/netbsd2minix/common.sh
-
-git clone --depth 1 git://github.com/jsonn/src $NETBSD
+cd $NETBSD || (git clone --depth 1 git://github.com/jsonn/src $NETBSD && cd $NETBSD)
+git pull
diff --git a/releasetools/netbsd2minix/whitelists.sh b/releasetools/netbsd2minix/whitelists.sh
old mode 100644
new mode 100755
index dc649543f..3b7f761ad
--- a/releasetools/netbsd2minix/whitelists.sh
+++ b/releasetools/netbsd2minix/whitelists.sh
@@ -1,11 +1,10 @@
-#!/bin/sh
-. releasetools/netbsd2minix/common.sh
-
 cd $N2M/whitelist
-for $item in `ls`
+for item in `ls`
 do
-	$N2M/applywhitelist.sh $item < $item
+	$N2M/applywhitelist.sh $NETBSD/$item < $item
+	echo "$item moved"
 done
 
-cd ..
-./applywhitelist $MINIX < minix.txt
+$N2M/applywhitelist.sh $MINIX < $N2M/minix.txt
+
+cd $MINIX