diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd
index 407b307d7a1d..5cc7aac2e6a9 100755
--- a/etc/rc.d/ntpd
+++ b/etc/rc.d/ntpd
@@ -1,52 +1,51 @@
 #!/bin/sh
 #
-# $NetBSD: ntpd,v 1.6 2002/03/22 04:33:59 thorpej Exp $
 # $FreeBSD$
 #
 
 # PROVIDE: ntpd
-# REQUIRE: DAEMON cleanvar
+# REQUIRE: DAEMON ntpdate cleanvar devfs
 # BEFORE:  LOGIN
 # KEYWORD: nojail
 
 . /etc/rc.subr
 
 name=ntpd
 rcvar=`set_rcvar`
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 start_precmd="ntpd_precmd"
 required_files="/etc/ntp.conf"
 
 ntpd_precmd()
 {
 	if checkyesno ntpd_sync_on_start; then
 		rc_flags="-g ${ntpd_flags}"
 	fi
 
 	if [ -z "$ntpd_chrootdir" ]; then
 		return 0;
 	fi
 
 	# If running in a chroot cage, ensure that the appropriate files
 	# exist inside the cage, as well as helper symlinks into the cage
 	# from outside.
 	#
 	# As this is called after the is_running and required_dir checks
 	# are made in run_rc_command(), we can safely assume ${ntpd_chrootdir}
 	# exists and ntpd isn't running at this point (unless forcestart
 	# is used).
 	#
 	if [ ! -c "${ntpd_chrootdir}/dev/clockctl" ]; then
 		rm -f "${ntpd_chrootdir}/dev/clockctl"
 		( cd /dev ; /bin/pax -rw -pe clockctl "${ntpd_chrootdir}/dev" )
 	fi
 	ln -fs "${ntpd_chrootdir}/var/db/ntp.drift" /var/db/ntp.drift
 
 	#	Change run_rc_commands()'s internal copy of $ntpd_flags
 	#
 	rc_flags="-u ntpd:ntpd -i ${ntpd_chrootdir} $rc_flags"
 }
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/etc/rc.d/ntpdate b/etc/rc.d/ntpdate
index 96adcbabb53a..45b898e31ea6 100755
--- a/etc/rc.d/ntpdate
+++ b/etc/rc.d/ntpdate
@@ -1,34 +1,32 @@
 #!/bin/sh
 #
-# $NetBSD: ntpdate,v 1.8 2002/03/22 04:16:39 lukem Exp $
 # $FreeBSD$
 #
 
-# BEFORE: ntpd
 # PROVIDE: ntpdate
 # REQUIRE: NETWORKING syslogd
 # KEYWORD: nojail
 
 . /etc/rc.subr
 
 name="ntpdate"
 rcvar=`set_rcvar`
 stop_cmd=":"
 start_cmd="ntpdate_start"
 
 ntpdate_start()
 {
 	if [ -z "$ntpdate_hosts" -a -f /etc/ntp.conf ]; then
 		ntpdate_hosts=`awk '
 			/^server[ \t]*127.127/      {next}
 			/^(server|peer)/            {print $2}
 		' </etc/ntp.conf`
 	fi
 	if [ -n "$ntpdate_hosts" -o -n "$rc_flags" ]; then
 		echo "Setting date via ntp."
 		${ntpdate_program:-ntpdate} $rc_flags $ntpdate_hosts
 	fi
 }
 
 load_rc_config $name
 run_rc_command "$1"