diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index bea6695bb3..1b52e9ba31 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -337,6 +337,14 @@ PLIST_DIRS=     lib/X11/oneko</programlisting>
 	  see if all the new directories are correctly deleted.  Also, try
 	  using the software after step 4, to ensure that it works correctly
 	  when installed from a package.</para>
+
+	<para>The most thorough way to automate these steps is via
+	  installing the <application>ports tinderbox</application>.
+	  This maintains <literal>jails</literal> in which you can
+	  test all of the above steps without changing the state of
+	  your running system.  Please see
+	  <filename>ports/ports-mgmt/tinderbox</filename> for more
+	  information.</para>
       </sect1>
 
       <sect1 id="porting-portlint">
@@ -9055,9 +9063,9 @@ post-install:
 	maintainer.  &os; has over 2000 ports without maintainers,
 	and this is an area where more volunteers are always needed.
 	(For a detailed description of the responsibilities of maintainers,
-	refer to the
+	refer to the section in the
 	<ulink url="&url.books.developers-handbook;/policies.html#POLICIES-MAINTAINER">
-	MAINTAINER on Makefiles</ulink> section.)</para>
+	Developer's Handbook</ulink>.)</para>
 
       <para> The best way to
 	send us the diff is by including it via &man.send-pr.1; (category