diff --git a/etc/Makefile b/etc/Makefile
index 6329381589ba..9f64e4c30846 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -12,8 +12,8 @@ BIN1=	amd.map apmd.conf auth.conf \
 	inetd.conf login.access login.conf \
 	mac.conf motd netconfig networks newsyslog.conf \
 	phones printcap profile protocols \
-	rc rc.atm rc.devfs rc.diskless1 rc.diskless2 rc.firewall rc.firewall6 \
-	rc.network rc.network6 rc.pccard rc.sendmail rc.serial rc.shutdown \
+	rc.atm rc.devfs rc.diskless1 rc.diskless2 rc.firewall rc.firewall6 \
+	rc.network rc.network6 rc.pccard rc.sendmail rc.serial \
 	rc.subr rc.syscons rc.sysctl remote rpc services \
 	shells sysctl.conf syslog.conf usbd.conf \
 	etc.${MACHINE_ARCH}/disktab \
@@ -37,7 +37,7 @@ SSL=	${.CURDIR}/../crypto/openssl/apps/openssl.cnf
 .endif
 
 # -rwxr-xr-x root:wheel, for the new cron root:wheel
-BIN2=	netstart pccard_ether rc.suspend rc.resume
+BIN2=	netstart pccard_ether rc.suspend rc.resume rc rc.shutdown
 
 DEFAULTS= rc.conf pccard.conf periodic.conf
 
diff --git a/sbin/init/init.c b/sbin/init/init.c
index 2ad5d958f226..64ad43b57ec5 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -737,6 +737,8 @@ runcom(void)
 #ifdef LOGIN_CAP
 		setprocresources(RESOURCE_RC);
 #endif
+		execv(_PATH_RUNCOM, argv + 1);
+		warning("can't exec %s: %m", _PATH_RUNCOM);
 		execv(_PATH_BSHELL, argv);
 		stall("can't exec %s for %s: %m", _PATH_BSHELL, _PATH_RUNCOM);
 		_exit(1);	/* force single user mode */
@@ -1497,6 +1499,8 @@ runshutdown(void)
 #ifdef LOGIN_CAP
 		setprocresources(RESOURCE_RC);
 #endif
+		execv(_PATH_RUNDOWN, argv + 1);
+		warning("can't exec %s: %m", _PATH_RUNDOWN);
 		execv(_PATH_BSHELL, argv);
 		warning("can't exec %s for %s: %m", _PATH_BSHELL, _PATH_RUNDOWN);
 		_exit(1);	/* force single user mode */