diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index f0ad817575..0d9c458e5d 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -2024,10 +2024,10 @@ EXTRACT_SUFX=  .tgz</programlisting>
 	  neither of these are set then <makevar>EXTRACT_SUFX</makevar>
 	  defaults to <literal>.tar.gz</literal>.</para>
 
-        <note>
+	<note>
 	  <para>You never need to set both <makevar>EXTRACT_SUFX</makevar> and
 	    <makevar>DISTFILES</makevar>.</para>
-        </note>
+	</note>
       </sect2>
 
       <sect2>
@@ -3235,23 +3235,23 @@ PATCHFILES=     patch1:test</programlisting>
       </sect2>
 
       <sect2>
-        <title>Circular dependencies are fatal</title>
+	<title>Circular dependencies are fatal</title>
 
-        <important>
-          <para>Do not introduce any circular dependencies into the
-          ports tree!</para>
-        </important>
+	<important>
+	  <para>Do not introduce any circular dependencies into the
+	  ports tree!</para>
+	</important>
 
-        <para>The ports building technology does not tolerate
-          circular dependencies.  If you introduce one, you will have
-          someone, somewhere in the world, whose FreeBSD installation will
-          break almost immediately, with many others quickly to follow.
-          These can really be hard to detect; if in doubt, before
-          you make that change, make sure you have done the following:
-          <command>cd /usr/ports; make index</command>.  That process
-          can be quite slow on older machines, but you may be able to
-          save a large number of people&mdash;including yourself&mdash;
-          a lot of grief in the process.</para>
+	<para>The ports building technology does not tolerate
+	  circular dependencies.  If you introduce one, you will have
+	  someone, somewhere in the world, whose FreeBSD installation will
+	  break almost immediately, with many others quickly to follow.
+	  These can really be hard to detect; if in doubt, before
+	  you make that change, make sure you have done the following:
+	  <command>cd /usr/ports; make index</command>.  That process
+	  can be quite slow on older machines, but you may be able to
+	  save a large number of people&mdash;including yourself&mdash;
+	  a lot of grief in the process.</para>
       </sect2>
     </sect1>
 
@@ -5025,7 +5025,7 @@ PLIST_SUB=      OCTAVE_VERSION=${OCTAVE_VERSION}</programlisting>
 	</note>
 
 	<example id="dot-error-breaks-index"><title></title>
-	  <para>Assume that someone has the line 
+	  <para>Assume that someone has the line
 	    <programlisting>USE_POINTYHAT=yes</programlisting>
 	    in <filename>make.conf</filename>.  The first of
 	    the next two <filename>Makefile</filename> snippets will
@@ -5225,10 +5225,10 @@ IGNORE=POINTYHAT is not supported
 	as is.</para>
 
       <para>Before you &man.send-pr.1;, you should review the
-        <ulink url="../../articles/problem-reports/pr-writing.html">
-        Writing the problem report</ulink> section in the Problem
-        Reports article; it contains far more information about how to write
-        useful problem reports.</para>
+	<ulink url="../../articles/problem-reports/pr-writing.html">
+	Writing the problem report</ulink> section in the Problem
+	Reports article; it contains far more information about how to write
+	useful problem reports.</para>
 
       <important>
 	<para>If your upgrade is motivated by security concerns or a
@@ -6505,13 +6505,13 @@ IGNORE=POINTYHAT is not supported
 		  </row>
 		  <row>
 		    <entry>5.2-CURRENT after NULL is made into ((void *)0)
-                        for C, creating more warnings.
+			for C, creating more warnings.
 		    </entry>
 		    <entry>502105</entry>
 		  </row>
 		  <row>
 		    <entry>5.2-CURRENT after pf is linked to the build and
-                        install.
+			install.
 		    </entry>
 		    <entry>502106</entry>
 		  </row>
@@ -6686,10 +6686,10 @@ post-install:
        ${LN} -sf liblinpack.so.1.0 ${PREFIX}/lib/liblinpack.so
 .endif</programlisting>
 
-        <para>You did remember to use tab instead of spaces after
-          <literal>BROKEN=</literal> and
-          <literal>TCL_LIB_FILE=</literal>, did you not?
-          <!-- smiley -->:-).</para>
+	<para>You did remember to use tab instead of spaces after
+	  <literal>BROKEN=</literal> and
+	  <literal>TCL_LIB_FILE=</literal>, did you not?
+	  <!-- smiley -->:-).</para>
       </sect1>
 
       <sect1 id="dads-documentation">
@@ -6827,7 +6827,7 @@ lib/X11/oneko/sounds/cat.au
 	<para>Make sure you do not use a UID already used by the system or
 	  other ports.</para>
 
-        <para>This is the current list of UIDs between 50 and 999.</para>
+	<para>This is the current list of UIDs between 50 and 999.</para>
 
 	<!-- Please keep this list sorted by uid -->
 	<programlisting>bind:*:53:53:Bind Sandbox:/:/sbin/nologin