diff --git a/rc/bin/cpurc b/rc/bin/cpurc
index 41efb0c6c..e32f05950 100755
--- a/rc/bin/cpurc
+++ b/rc/bin/cpurc
@@ -8,14 +8,20 @@ for(i in m i P S t u '$')
 
 mount -qb /srv/cons /dev
 
-# usb listener
-nusbrc
-
 # mount points
 mntgen -s slashn && chmod 666 /srv/slashn
 mntgen -s slashmnt /mnt && chmod 666 /srv/slashmnt
 mntgen -s mntexport /mnt/exportfs && chmod 666 /srv/mntexport
 
+# move factotum from /mnt to /mnt/factotum
+mount /srv/factotum /mnt/temp
+unmount /srv/factotum /mnt
+bind /mnt/temp/factotum /mnt/factotum
+unmount /mnt/temp
+
+# usb listener
+nusbrc
+
 # name translation, cs sets /dev/sysname
 ndb/cs
 sysname=`{cat /dev/sysname}
@@ -68,11 +74,6 @@ case `{	echo $sysname; ndb/query sys $sysname dom
 	} | sed 's,[^ ]+=,,g'}}
 
 	# cpu+auth server
-
-	# prevent factotum deadlock
-	aux/stub -d /mnt/keys
-	aux/stub -d /mnt/netkeys
-
 	auth/keyfs -wp -m /mnt/keys /adm/keys
 	aux/listen -q -t /rc/bin/service.auth -d /rc/bin/service tcp
 case *
diff --git a/rc/bin/termrc b/rc/bin/termrc
index c06321026..8a109274d 100755
--- a/rc/bin/termrc
+++ b/rc/bin/termrc
@@ -2,10 +2,6 @@
 # terminal startup
 TIMESYNCARGS=(-rLa1000000)
 
-mntgen -s slashn && chmod 666 /srv/slashn
-mntgen -s slashmnt /mnt && chmod 666 /srv/slashmnt
-mntgen -s mntexport /mnt/exportfs && chmod 666 /srv/mntexport
-
 # bind all likely devices
 for(i in S f k t m i v L P u U A '$' Σ κ)
 	bind -a '#'^$i /dev >/dev/null >[2=1]
@@ -13,6 +9,17 @@ rm -f /env/i
 
 mount -qb /srv/cons /dev
 
+# mount points 
+mntgen -s slashn && chmod 666 /srv/slashn
+mntgen -s slashmnt /mnt && chmod 666 /srv/slashmnt
+mntgen -s mntexport /mnt/exportfs && chmod 666 /srv/mntexport
+
+# move factotum from /mnt to /mnt/factotum
+mount /srv/factotum /mnt/temp
+unmount /srv/factotum /mnt
+bind /mnt/temp/factotum /mnt/factotum
+unmount /mnt/temp
+
 # usb listener
 nusbrc