diff --git a/src/etc/rc b/src/etc/rc
index e8e9cc96..c90c4427 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.247 2004/05/16 15:45:46 henning Exp $
+#	$OpenBSD: rc,v 1.248 2004/06/04 04:26:41 grange Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -640,6 +640,10 @@ if [ X"${sensorsd_flags}" != X"NO" ]; then
 	echo -n ' sensorsd';	/usr/sbin/sensorsd ${sensorsd_flags}
 fi
 
+if [ X"${hotplugd_flags}" != X"NO" -a -x /usr/sbin/hotplugd ]; then
+	echo -n ' hotplugd';	/usr/sbin/hotplugd ${hotplugd_flags}
+fi
+
 echo -n ' cron';		cron
 
 echo '.'
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index d6ebb044..9e5a1e51 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.96 2004/05/25 16:41:01 jakob Exp $
+#	$OpenBSD: rc.conf,v 1.97 2004/06/04 04:26:41 grange Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
@@ -28,6 +28,7 @@ rtsold_flags=NO		# for normal use: interface
 			# be sure to set net.inet6.ip6.accept_rtadv=1
 lpd_flags=NO		# for normal use: "" (or "-l" for debugging)
 sensorsd_flags=NO	# for normal use: ""
+hotplugd_flags=NO	# for normal use: ""
 
 # use -u to disable chroot, see httpd(8)
 httpd_flags=NO		# for normal use: "" (or "-DSSL" after reading ssl(8))