Index: src/etc/defaults/rc.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/rc.conf,v
retrieving revision 1.280
diff -u -r1.280 rc.conf
--- src/etc/defaults/rc.conf	13 Apr 2006 18:34:13 -0000	1.280
+++ src/etc/defaults/rc.conf	18 Apr 2006 11:33:40 -0000
@@ -260,6 +260,7 @@
 ntpdate_flags="-b"		# Flags to ntpdate (if enabled).
 ntpd_enable="NO"		# Run ntpd Network Time Protocol (or NO).
 ntpd_program="/usr/sbin/ntpd"	# path to ntpd, if you want a different one.
+ntpd_config="/etc/ntp.conf"	# ntpd(8) configuration file
 ntpd_sync_on_start="NO"		# Sync time on ntpd startup, even if offset is high
 ntpd_flags="-p /var/run/ntpd.pid -f /var/db/ntpd.drift"
 				# Flags to ntpd (if enabled).
Index: src/etc/rc.d/ntpd
===================================================================
RCS file: /home/ncvs/src/etc/rc.d/ntpd,v
retrieving revision 1.12
diff -u -r1.12 ntpd
--- src/etc/rc.d/ntpd	21 Dec 2005 09:48:41 -0000	1.12
+++ src/etc/rc.d/ntpd	18 Apr 2006 11:33:40 -0000
@@ -15,12 +15,17 @@
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 start_precmd="ntpd_precmd"
-required_files="/etc/ntp.conf"
+
+load_rc_config $name
+
+required_files="${ntpd_config}"
 
 ntpd_precmd()
 {
+	rc_flags="-c ${ntpd_config} ${ntpd_flags}"
+
 	if checkyesno ntpd_sync_on_start; then
-		rc_flags="-g ${ntpd_flags}"
+		rc_flags="-g $rc_flags"
 	fi
 
 	if [ -z "$ntpd_chrootdir" ]; then
@@ -47,5 +52,4 @@
 	rc_flags="-u ntpd:ntpd -i ${ntpd_chrootdir} $rc_flags"
 }
 
-load_rc_config $name
 run_rc_command "$1"
Index: src/share/man/man5/rc.conf.5
===================================================================
RCS file: /home/ncvs/src/share/man/man5/rc.conf.5,v
retrieving revision 1.292
diff -u -r1.292 rc.conf.5
--- src/share/man/man5/rc.conf.5	13 Apr 2006 18:34:14 -0000	1.292
+++ src/share/man/man5/rc.conf.5	18 Apr 2006 11:33:41 -0000
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.292 2006/04/13 18:34:14 brooks Exp $
 .\"
-.Dd April 8, 2006
+.Dd April 18, 2006
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -1804,6 +1804,13 @@
 .Xr ntpd 8
 (default
 .Pa /usr/sbin/ntpd ) .
+.It Va ntpd_config
+.Pq Vt str
+Path to
+.Xr ntpd 8
+configuration file.
+(default
+.Pa /etc/ntp.conf ) .
 .It Va ntpd_flags
 .Pq Vt str
 If