diff --git a/sys/conf/files b/sys/conf/files
index bc6e2623dc0d..46cf9a5452ab 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.149 1997/10/09 23:19:24 explorer Exp $
+#	$NetBSD: files,v 1.150 1997/10/09 23:54:19 explorer Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
@@ -8,7 +8,6 @@ defopt	KMEMSTATS
 defopt	RTC_OFFSET
 defopt	TCP_RECVSPACE
 defopt	TCP_SENDSPACE
-defopt	DEVRANDOM
 
 defopt	DEVPAGER
 defopt	SWAPPAGER
@@ -193,8 +192,8 @@ file dev/ccd.c				ccd			needs-flag
 file dev/md.c				md			needs-count
 file dev/mulaw.c			mulaw
 file dev/vnd.c				vnd			needs-flag
-file dev/rnd.c				devrandom
-file dev/rndpool.c			devrandom
+file dev/rnd.c
+file dev/rndpool.c
 file isofs/cd9660/cd9660_bmap.c		cd9660
 file isofs/cd9660/cd9660_lookup.c	cd9660
 file isofs/cd9660/cd9660_node.c		cd9660
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 9e17ef3e3a7b..dacfbe33108b 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: init_main.c,v 1.103 1997/10/09 23:17:37 explorer Exp $	*/
+/*	$NetBSD: init_main.c,v 1.104 1997/10/09 23:53:01 explorer Exp $	*/
 
 /*
  * Copyright (c) 1995 Christopher G. Demetriou.  All rights reserved.
@@ -41,8 +41,6 @@
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
  */
 
-#include "opt_devrandom.h"
-
 #include <sys/param.h>
 #include <sys/filedesc.h>
 #include <sys/errno.h>
@@ -78,9 +76,7 @@
 #include <sys/domain.h>
 #include <sys/mbuf.h>
 #include <sys/namei.h>
-#ifdef DEVRANDOM
 #include <sys/rnd.h>
-#endif
 
 #include <sys/syscall.h>
 #include <sys/syscallargs.h>
@@ -190,9 +186,7 @@ main(framep)
 	kmeminit();
 	disk_init();		/* must come before autoconfiguration */
 	tty_init();		/* initialise tty list */
-#ifdef DEVRANDOM
 	rnd_init();
-#endif
 	config_init();		/* init autoconfiguration data structures */
 	cpu_startup();