diff --git a/src/etc/rc b/src/etc/rc
index e944df55..a10922c1 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.99 1999/05/30 23:20:52 millert Exp $
+#	$OpenBSD: rc,v 1.100 1999/07/15 14:31:52 provos Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -77,10 +77,14 @@ rm -f /fastboot		# XXX (root now writeable)
 echo 'setting tty flags'
 ttyflags -a
 
-# if there's no /etc/host.random, make one through /dev/urandom
-if [ ! -f /etc/host.random ]; then
-	dd if=/dev/urandom of=/etc/host.random bs=1024 count=64 >/dev/null 2>&1
-	chmod 600 /etc/host.random
+# if there's no /var/db/host.random, make one through /dev/urandom
+if [ ! -f /var/db/host.random ]; then
+	dd if=/dev/urandom of=/var/db/host.random bs=1024 count=64 \
+		>/dev/null 2>&1
+	chmod 600 /var/db/host.random
+else
+	dd if=/var/db/host.random of=/dev/urandom bs=1024 count=64 \
+		>/dev/null 2>&1
 fi
 
 # set hostname, turn on network
diff --git a/src/etc/rc.shutdown b/src/etc/rc.shutdown
index f38ab55e..2df5f496 100644
--- a/src/etc/rc.shutdown
+++ b/src/etc/rc.shutdown
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.shutdown,v 1.1 1999/07/06 07:55:03 deraadt Exp $
+#	$OpenBSD: rc.shutdown,v 1.2 1999/07/15 14:31:52 provos Exp $
 #
 # If it exists, this script is run at system-shutdown by reboot(8),
 # halt(8).
@@ -8,6 +8,10 @@
 
 echo -n /etc/rc.shutdown in progress...
 
+# save part of our entropy pool for reuse on reboot
+dd if=/dev/urandom of=/var/db/host.random bs=1024 count=64 >/dev/null 2>&1
+chmod 600 /var/db/host.random
+
 #
 # Your shell code goes here
 #