diff --git a/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
index 47e70ca7ff..53d7cbd3d2 100644
--- a/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
+++ b/en_US.ISO8859-1/books/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>
 
diff --git a/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
index 73c0511029..b0e7f034e2 100644
--- a/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
@@ -430,7 +430,7 @@ etc/orbit.conf-dist
 	  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
+	    >/usr/local</filename> and the last
 	  extracted file was <filename>bin/emacs</filename>.</para>
 
 	<variablelist>
@@ -450,7 +450,7 @@ etc/orbit.conf-dist
 	      <para>Expand to the current directory prefix, as set
 		with <literal>@cwd</literal>.  In the example case
 		<filename
-		  class="directory">/usr/local</filename>.</para>
+		  >/usr/local</filename>.</para>
 	    </listitem>
 	  </varlistentry>
 
@@ -462,7 +462,7 @@ etc/orbit.conf-dist
 		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>
+		  >/usr/local/bin</filename>.</para>
 	    </listitem>
 	  </varlistentry>
 
@@ -583,7 +583,7 @@ etc/orbit.conf-dist
 
       <para>Package list files can be extended by keywords that are
 	defined in the <filename
-	  class="directory">${PORTSDIR}/Keywords</filename> directory.
+	  >${PORTSDIR}/Keywords</filename> directory.
 	The settings for each keyword are stored in a
 	<acronym>UCL</acronym> file named
 	<filename><replaceable>keyword</replaceable>.ucl</filename>.
diff --git a/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
index a182b20676..6e64550552 100644
--- a/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
@@ -668,19 +668,19 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi</programlisting>
 
 	      <listitem>
 		<para>Define <varname>KMODDIR</varname> to
-		  <filename class="directory">/boot/modules</filename>
+		  <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>,
+		  <filename>/boot/kernel</filename>,
 		  it will be rewritten to <filename
-		    class="directory">/boot/modules</filename>.  This
+		    >/boot/modules</filename>.  This
 		  prevents breaking packages when upgrading the kernel
 		  due to <filename
-		    class="directory">/boot/kernel</filename> being
+		    >/boot/kernel</filename> being
 		  renamed to <filename
-		    class="directory">/boot/kernel.old</filename> in
+		    >/boot/kernel.old</filename> in
 		  the process.</para>
 	      </listitem>
 
@@ -866,7 +866,7 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi</programlisting>
 	      <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>
@@ -1288,7 +1288,7 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi</programlisting>
 	      <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>.
+		    ><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>