diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
index 5e7fd58307..3854b56bb3 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
@@ -1158,7 +1158,7 @@ freefall		MX	20	who.cdrom.com</programlisting>
 	  (or create it if it doesn't exist) and add the following
 	  line:</para>
 
-	<screen>pwcheck_method: passwd</screen>
+	<programlisting>pwcheck_method: passwd</programlisting>
 
 	<para>This method will enable <application>sendmail</application>
 	  to authenticate against your FreeBSD <filename>passwd</filename>
@@ -1172,9 +1172,9 @@ freefall		MX	20	who.cdrom.com</programlisting>
 	<para>Now, edit <filename>/etc/make.conf</filename> and add the
 	  following lines:</para>
 
-	<screen>SENDMAIL_CFLAGS=-I/usr/local/include/sasl1 -DSASL</screen>
-	<screen>SENDMAIL_LDFLAGS=-L/usr/local/lib</screen>
-	<screen>SENDMAIL_LDADD=-lsasl</screen>
+	<programlisting>SENDMAIL_CFLAGS=-I/usr/local/include/sasl1 -DSASL
+SENDMAIL_LDFLAGS=-L/usr/local/lib
+SENDMAIL_LDADD=-lsasl</programlisting>
 
 	<para>These lines will give <application>sendmail</application>
 	the proper configuration options for linking
@@ -1187,11 +1187,11 @@ freefall		MX	20	who.cdrom.com</programlisting>
       <step>
 	<para>Recompile sendmail by executing the following commands:</para>
 
-	<screen>&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput></screen>
-	<screen>&prompt.root; <userinput>make cleandir</userinput></screen>
-	<screen>&prompt.root; <userinput>make obj</userinput></screen>
-	<screen>&prompt.root; <userinput>make</userinput></screen>
-	<screen>&prompt.root; <userinput>make install</userinput></screen>
+	<screen>&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
+&prompt.root; <userinput>make cleandir</userinput>
+&prompt.root; <userinput>make obj</userinput>
+&prompt.root; <userinput>make</userinput>
+&prompt.root; <userinput>make install</userinput></screen>
 
 	<para>The compile of sendmail should not have any problems
 	  if <filename>/usr/src</filename> has not been changed extensively,
@@ -1202,13 +1202,13 @@ freefall		MX	20	who.cdrom.com</programlisting>
 	<para>After <application>sendmail</application> has been compiled
 	  and reinstalled, edit your <filename>/etc/mail/freebsd.mc</filename>
 	  file, or whichever file you use as your .mc file. Many administrators
-	  choose to use the output from &man.hostname.1 as the .mc file for
+	  choose to use the output from &man.hostname.1; as the .mc file for
 	  uniqueness.  Add these lines to it:</para>
 
-	<screen>dnl set SASL options</screen>
-	<screen>TRUST_AUTH_MECH(`GSSAPI DIGEST-MD5 CRAM-MD5 LOGIN')dnl</screen>
-	<screen>define(`confAUTH_MECHANISMS', `GSSAPI DIGEST-MD5 CRAM-MD5 LOGIN')dnl</screen>
-	<screen>define(`confDEF_AUTH_INFO', `/etc/mail/auth-info')dnl</screen>
+	<programlisting>dnl set SASL options
+TRUST_AUTH_MECH(`GSSAPI DIGEST-MD5 CRAM-MD5 LOGIN')dnl
+define(`confAUTH_MECHANISMS', `GSSAPI DIGEST-MD5 CRAM-MD5 LOGIN')dnl
+define(`confDEF_AUTH_INFO', `/etc/mail/auth-info')dnl</programlisting>
 
 	<para>These options configure the different methods available to
 	<application>sendmail</application> for authenticating users.
@@ -1234,8 +1234,9 @@ freefall		MX	20	who.cdrom.com</programlisting>
       <filename>/var/log/maillog</filename> for any errors.</para>
 
     <para>For more information, please see the <application>sendmail</application>
-      page regarding <acronym>SMTP</acronym> authentication.
-      <ulink url="http://www.sendmail.org/~ca/email/auth.html"</ulink></para>
+      page regarding
+      <ulink url="http://www.sendmail.org/~ca/email/auth.html">
+      <acronym>SMTP</acronym> authentication</ulink>.</para>
 
   </sect1>