Index: porters-handbook/makefiles/chapter.xml
===================================================================
--- porters-handbook/makefiles/chapter.xml
+++ porters-handbook/makefiles/chapter.xml
@@ -3408,7 +3408,7 @@
 
       <para>Available <varname>USE_<replaceable>*</replaceable></varname> and
 	<varname>WANT_<replaceable>*</replaceable></varname> are defined in the files in
-	<filename class="directory">/usr/ports/Mk</filename>.</para>
+	<filename>/usr/ports/Mk</filename>.</para>
     </sect2>
   </sect1>
 
Index: porters-handbook/plist/chapter.xml
===================================================================
--- porters-handbook/plist/chapter.xml
+++ porters-handbook/plist/chapter.xml
@@ -429,9 +429,9 @@
 	  the unpacking process.  If command contains any of these
 	  sequences somewhere in it, they are expanded
 	  inline.  For these examples, assume that
-	  <literal>@cwd</literal> is set to <filename
-	    class="directory">/usr/local</filename> and the last
-	  extracted file was <filename>bin/emacs</filename>.</para>
+	  <literal>@cwd</literal> is set to <filename>/usr/local</filename>
+	  and the last extracted file was
+	  <filename>bin/emacs</filename>.</para>
 
 	<variablelist>
 	  <varlistentry>
@@ -449,8 +449,7 @@
 	    <listitem>
 	      <para>Expand to the current directory prefix, as set
 		with <literal>@cwd</literal>.  In the example case
-		<filename
-		  class="directory">/usr/local</filename>.</para>
+		<filename>/usr/local</filename>.</para>
 	    </listitem>
 	  </varlistentry>
 
@@ -461,8 +460,8 @@
 	      <para>Expand to the basename of the fully qualified
 		filename, that is, the current directory prefix plus
 		the last filespec, minus the trailing filename.  In
-		the example case, that would be <filename
-		  class="directory">/usr/local/bin</filename>.</para>
+		the example case, that would be
+		<filename>/usr/local/bin</filename>.</para>
 	    </listitem>
 	  </varlistentry>
 
@@ -582,8 +581,7 @@
       <title>Creating New Keywords</title>
 
       <para>Package list files can be extended by keywords that are
-	defined in the <filename
-	  class="directory">${PORTSDIR}/Keywords</filename> directory.
+	defined in the <filename>${PORTSDIR}/Keywords</filename> directory.
 	The settings for each keyword are stored in a
 	<acronym>UCL</acronym> file named
 	<filename><replaceable>keyword</replaceable>.ucl</filename>.
Index: porters-handbook/uses/chapter.xml
===================================================================
--- porters-handbook/uses/chapter.xml
+++ porters-handbook/uses/chapter.xml
@@ -668,19 +668,16 @@
 
 	      <listitem>
 		<para>Define <varname>KMODDIR</varname> to
-		  <filename class="directory">/boot/modules</filename>
-		  by default, add it to <varname>PLIST_SUB</varname>
-		  and <varname>MAKE_ENV</varname>, and create it upon
+		  <filename>/boot/modules</filename> by default, add
+		  it to <varname>PLIST_SUB</varname> and
+		  <varname>MAKE_ENV</varname>, and create it upon
 		  installation.  If <varname>KMODDIR</varname> is set
 		  to
-		  <filename class="directory">/boot/kernel</filename>,
-		  it will be rewritten to <filename
-		    class="directory">/boot/modules</filename>.  This
-		  prevents breaking packages when upgrading the kernel
-		  due to <filename
-		    class="directory">/boot/kernel</filename> being
-		  renamed to <filename
-		    class="directory">/boot/kernel.old</filename> in
+		  <filename>/boot/kernel</filename>, it will be rewritten
+		  to <filename>/boot/modules</filename>.  This prevents
+		  breaking packages when upgrading the kernel
+		  due to <filename>/boot/kernel</filename> being
+		  renamed to <filename>/boot/kernel.old</filename> in
 		  the process.</para>
 	      </listitem>
 
@@ -866,7 +863,7 @@
 	      <listitem>
 		<para><varname>PERL_ARCH</varname>: Directory name of
 		  architecture dependent libraries, defaults to
-		  <filename class="directory">mach</filename></para>
+		  <filename>mach</filename></para>
 	      </listitem>
 
 	      <listitem>
@@ -1287,8 +1284,8 @@
 
 	      <listitem>
 		<para><varname>WEBPLUGIN_DIR</varname>: The directory
-		  to install the plug-in files to, default <filename
-		    class="directory"><replaceable>PREFIX</replaceable>/lib/browser_plugins/<replaceable>WEBPLUGIN_NAME</replaceable></filename>.
+		  to install the plug-in files to, default
+		    <filename><replaceable>PREFIX</replaceable>/lib/browser_plugins/<replaceable>WEBPLUGIN_NAME</replaceable></filename>.
 		  Set this if the port installs plug-in files outside
 		  of the default directory to prevent broken symbolic
 		  links.</para>