diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index 6f6b46f50c..74c411fdc2 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -1918,7 +1918,7 @@ scratchdir=<filename>/<replaceable>usr2</replaceable></filename>
 ln -sf ${scratchdir}/portbuild /var/
 
 # Identify builds ready for use
-cd /var/portbuild/<replaceable>${arch}</replaceable>
+cd /var/portbuild/<replaceable>arch</replaceable>
 for i in */builds/*; do
     if [ -f ${i}/.ready ]; then
         mkdir /tmp/.setup-${i##*/}
@@ -2041,23 +2041,24 @@ touch /tmp/.boot_finished</screen>
     </sect2>
 
     <sect2 id="pointyhat-configuration">
-      <title>Configuration on <literal>pointyhat</literal></title>
+      <title>Configuration on the server</title>
 
       <para>These steps need to be taken by a <literal>portmgr</literal>
 	acting as <literal>ports-<replaceable>${arch}</replaceable></literal>
-	on <hostid>pointyhat</hostid>.
+	on the server.
       </para>
 
       <procedure>
 	<step>
 	  <para>If any of the default TCP ports is not available (see
 	    above), you will need to create an <command>ssh</command>
-	    tunnel for it and include it in the
+	    tunnel for them and include its invocation command in
+	    <literal>ports-<replaceable>${arch}</replaceable></literal>'s
 	    <filename>crontab</filename>.</para>
 	</step>
 
 	<step>
-	  <para>Add an entry to
+	  <para>Unless you can use the defaults, add an entry to
 	    <filename>/home/ports-<replaceable>${arch}</replaceable>/.ssh/config</filename>
 	    to specify the public IP address, TCP port for
 	    <command>ssh</command>, username, and any other necessary