diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
index f05e02fc8f..b3b230b2d7 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -5976,7 +5976,7 @@ zone "10.168.192.in-addr.arpa" in {
 	  clock setting and the correct time.</para>
 
 	<para>To enable &man.ntpdate.8; at boot time, add
-	  <programlisting>ntpdate_enable="YES"</programlisting> to
+	  <literal>ntpdate_enable="YES"</literal> to
 	  <filename>/etc/rc.conf</filename>.  You will also need to
 	  specify all servers you wish to synchronize with and any
 	  flags to be passed to &man.ntpdate.8; in
@@ -6034,12 +6034,12 @@ driftfile /var/db/ntp.drift</programlisting>
 
 	<para>By default, your NTP server will be accessible to all
 	  hosts on the Internet.  The <literal>restrict</literal>
-	  option in &man.ntp.conf.5; allows you to control which
+	  option in <filename>/etc/ntp.conf</filename> allows you to control which
 	  machines can access your server.</para>
 
 	<para>If you want to deny all machines from accessing your NTP
 	  server, add the following line to
-	  <filename>/etc/ntp.conf</filename></para>
+	  <filename>/etc/ntp.conf</filename>:</para>
 
         <programlisting>restrict default ignore</programlisting>
 
@@ -6067,7 +6067,7 @@ driftfile /var/db/ntp.drift</programlisting>
       <title>Running the NTP Server</title>
 
       <para>To ensure the NTP server is started at boot time, add the
-	line <programlisting>xntpd_enable="YES"</programlisting> to
+	line <literal>xntpd_enable="YES"</literal> to
 	<filename>/etc/rc.conf</filename>.  If you wish to pass
 	additional flags to &man.ntpd.8; edit the
 	<varname>xntpd_flags</varname> parameter in
@@ -6078,6 +6078,12 @@ driftfile /var/db/ntp.drift</programlisting>
 	parameters from <varname>xntpd_flags</varname> in
 	<filename>/etc/rc.conf</filename>.  For example:</para>
       <screen>&prompt.root; <userinput>ntpd -p /var/run/ntpd.pid</userinput></screen>
+
+      <note>
+	<para>Under &os;&nbsp;5.X, various options in
+	  <filename>/etc/rc.conf</filename> have been renamed.  Thus,
+	  you have to replace every instance of <literal>xntpd</literal>
+	  with <literal>ntpd</literal> in the options above.</para></note>
     </sect2>
 
     <sect2>