Index: head/etc/ntp.conf
===================================================================
--- head/etc/ntp.conf	(revision 195651)
+++ head/etc/ntp.conf	(revision 195652)
@@ -1,59 +1,64 @@
 #
 # $FreeBSD$
 #
 # Default NTP servers for the FreeBSD operating system.
 #
 # Don't forget to enable ntpd in /etc/rc.conf with:
 # ntpd_enable="YES"
 #
 # The driftfile is by default /var/db/ntpd.drift, check
 # /etc/defaults/rc.conf on how to change the location.
 #
 
 #
 # The following three servers will give you a random set of three
 # NTP servers geographically close to you.
-# See http://en.wikipedia.org/wiki/NTP_pool for details.
+# See http://www.pool.ntp.org/ for details. Note, the pool encourages
+# users with a static IP and good upstream NTP servers to add a server
+# to the pool. See http://www.pool.ntp.org/join.html if you are interested.
 #
 # The option `iburst' is used for faster initial synchronisation.
 # The option `maxpoll 9' is used to prevent PLL/FLL flipping on FreeBSD.
 #
-server 0.pool.ntp.org iburst maxpoll 9
-server 1.pool.ntp.org iburst maxpoll 9
-server 2.pool.ntp.org iburst maxpoll 9
+server 0.freebsd.pool.ntp.org iburst maxpoll 9
+server 1.freebsd.pool.ntp.org iburst maxpoll 9
+server 2.freebsd.pool.ntp.org iburst maxpoll 9
+#server 3.freebsd.pool.ntp.org iburst maxpoll 9
 
 #
 # If you want to pick yourself which country's public NTP server
 # you want sync against, comment out the above servers, uncomment
-# the next ones and replace CC with the country's abbrevation.
+# the next ones and replace CC with the country's abbreviation.
 # Make sure that the hostnames resolve to a proper IP address!
 #
 # server 0.CC.pool.ntp.org iburst maxpoll 9
 # server 1.CC.pool.ntp.org iburst maxpoll 9
 # server 2.CC.pool.ntp.org iburst maxpoll 9
 
 #
 # Security: Only accept NTP traffic from the following hosts.
 # The following configuration example only accepts traffic from the
 # above defined servers.
 #
 # Please note that this example doesn't work for the servers in
 # the pool.ntp.org domain since they return multiple A records.
 # (This is the reason that by default they are commented out)
 #
 #restrict default ignore
 #restrict 0.pool.ntp.org nomodify nopeer noquery notrap
 #restrict 1.pool.ntp.org nomodify nopeer noquery notrap
 #restrict 2.pool.ntp.org nomodify nopeer noquery notrap
 #restrict 127.0.0.1
 #restrict -6 ::1
 #restrict 127.127.1.0
 
 #
-# If we lose sync against all configured servers, the NTP clients
-# syncing against this server will lose sync too. To overcome this,
-# we will act as a stratum 10 server with our own internal clock
-# so that everybody at least will have the same time as we have.
+# If a server loses sync with all upstream servers, NTP clients
+# no longer follow that server. The local clock can be configured
+# to provide a time source when this happens, but it should usually
+# be configured on just one server on a network. For more details see
+# http://support.ntp.org/bin/view/Support/UndisciplinedLocalClock
+# The use of Orphan Mode may be preferable.
 #
-server 127.127.1.0
-fudge 127.127.1.0 stratum 10
+#server 127.127.1.0
+#fudge 127.127.1.0 stratum 10