diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
index bffeb17aaf..c7b48ea0d7 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
@@ -1135,7 +1135,7 @@ freefall		MX	20	who.cdrom.com</programlisting>
     <para>Having <acronym>SMTP</acronym> Authentication in place on
       your mail server has a number of benefits.
       <acronym>SMTP</acronym> Authentication can add another layer
-      of security to sendmail, and has the benefit of giving mobile
+      of security to <application>sendmail</application>, and has the benefit of giving mobile
       users who switch hosts the ability to use the same mail server
       without the need to reconfigure their mail client settings
       each time.</para>
@@ -1148,7 +1148,7 @@ freefall		MX	20	who.cdrom.com</programlisting>
 	  <filename role="package">security/cyrus-sasl</filename> has
 	  a number of compile time options to choose from and, for
 	  the method we will be using here, make sure to select the
-	  pwcheck option.</para>
+	  <option>pwcheck</option> option.</para>
       </step>
 
 
@@ -1185,7 +1185,7 @@ SENDMAIL_LDADD=-lsasl</programlisting>
       </step>
 
       <step>
-	<para>Recompile sendmail by executing the following commands:</para>
+	<para>Recompile <application>sendmail</application> by executing the following commands:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput>
 &prompt.root; <userinput>make cleandir</userinput>
@@ -1193,7 +1193,7 @@ SENDMAIL_LDADD=-lsasl</programlisting>
 &prompt.root; <userinput>make</userinput>
 &prompt.root; <userinput>make install</userinput></screen>
 
-	<para>The compile of sendmail should not have any problems
+	<para>The compile of <application>sendmail</application> should not have any problems
 	  if <filename>/usr/src</filename> has not been changed extensively
 	  and the shared libraries it needs are available.</para>
       </step>