diff --git a/src/etc/rc b/src/etc/rc
index 7c14794c..8b47f8fd 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.84 1998/08/18 23:11:15 marc Exp $
+#	$OpenBSD: rc,v 1.85 1998/08/18 23:54:41 marc Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -436,9 +436,10 @@ fi
 
 echo -n standard daemons:
 
-# $apmd is imported from /etc/rc.conf;
-if [ X"${apmd}" == X"YES" -a -x /usr/sbin/apmd ]; then
-        echo -n ' apmd';        /usr/sbin/apmd
+# $apmd_flags is imported from /etc/rc.conf;
+# don't run daemon if $apmd_flags == NO or /usr/sbin/apmd doesn't exist
+if [ "X${apmd_flags}" != X"NO" -a -x /usr/sbin/apmd ]; then
+        echo -n ' apmd';        /usr/sbin/apmd ${apmd_flags}
 fi
 
 echo -n ' cron';		cron
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 2f25b813..bc8c5e52 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.24 1998/08/18 23:11:16 marc Exp $
+#	$OpenBSD: rc.conf,v 1.25 1998/08/18 23:54:42 marc Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for 'normal' use: routed_flags="-q"
@@ -15,6 +15,7 @@ timed_flags=NO		# for 'normal' use: timed_flags=""
 photurisd_flags=NO	# for 'normal' use: photurisd_flags=""
 mopd_flags=NO		# for 'normal' use: mopd_flags="-a"
 httpd_flags=NO		# for 'normal' use: httpd_flags=""
+apmd_flags=NO		# for 'normal' use: apmd_flags=""
 
 # On some architectures, you must also disable console getty in /etc/ttys
 xdm_flags=NO		# for 'normal' use: xdm_flags=""
@@ -35,7 +36,6 @@ inetd=YES		# almost always needed
 lpd=NO			# printing daemons
 check_quotas=YES	# NO may be desireable in some YP environments
 sshd=YES		# run sshd if it exists
-apmd=NO			# run apmd if it exists
 
 # miscellaneous other flags
 # only used if the appropriate server is marked YES above