diff --git a/tools/chrootmake.sh b/tools/chrootmake.sh
index 68fc3bb4b..3a7ab9632 100755
--- a/tools/chrootmake.sh
+++ b/tools/chrootmake.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 cd /usr/src || exit 1
+( cd etc && make install )
 make world install || exit 1
 cd tools || exit 1
 rm revision
diff --git a/tools/release.sh b/tools/release.sh
index f805ab4d2..4e28b98ed 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -211,7 +211,7 @@ then
 	# Make sure the CD knows it's a CD
 	date >$RELEASEDIR/CD
 	echo " * Chroot build"
-	chroot $RELEASEDIR "/usr/bin su bin -c '/bin/sh -x /usr/src/tools/chrootmake.sh'" || exit 1
+	chroot $RELEASEDIR "/bin/sh -x /usr/src/tools/chrootmake.sh" || exit 1
 	echo " * Chroot build done"
 	# The build process leaves some file in src as root.
 	chown -R bin $RELEASEDIR/usr/src*