diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index 0243b3580d..93916406b2 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -2160,13 +2160,13 @@ ssh_cmd="/usr/local/bin/ssh"
       <title>Enabling the node</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>.
+	acting as <literal>ports-<replaceable>arch</replaceable></literal>:
       </para>
 
       <procedure>
 	<step>
-	  <para>Ensure that <literal>ssh</literal> is working by executing
+	  <para>Ensure that <literal>ssh</literal> to the client
+	    is working by executing
 	    <command>ssh <replaceable>hostname</replaceable> uname -a</command>.
 	    The actual command is not important; what is important is to
 	    confirm the setup, and also add an entry into
@@ -2176,7 +2176,7 @@ ssh_cmd="/usr/local/bin/ssh"
 	</step>
 
 	<step>
-	  <para>Populate the node's copy of
+	  <para>Populate the client's copy of
 	    <filename>/var/portbuild/scripts/</filename> by something like
 	    <command>/var/portbuild/scripts/dosetupnode <replaceable>arch</replaceable> <replaceable>major</replaceable> latest <replaceable>hostname</replaceable></command>.
 	    Verify that you now have files in that directory.
@@ -2195,7 +2195,7 @@ ssh_cmd="/usr/local/bin/ssh"
       </procedure>
 
       <para>This step needs to be taken by a <literal>portmgr</literal>
-	acting as <literal>root</literal> on <hostid>pointyhat</hostid>.
+	acting as <literal>root</literal>:
       </para>
 
       <procedure>
@@ -2217,6 +2217,20 @@ ssh_cmd="/usr/local/bin/ssh"
 	    </command></para>
 	</step>
       </procedure>
+
+      <para>Finally, again as <literal>portmgr</literal>
+	acting as <literal>ports-<replaceable>arch</replaceable></literal>:
+      </para>
+
+      <procedure>
+	<step>
+	  <para>Once you are sure that the client is working, tell
+	    <application>pollmachine</application> about it by adding
+	    it to
+	    <filename>/var/portbuild/<replaceable>${arch}</replaceable>/mlist</filename>.
+	  </para>
+	</step>
+      </procedure>
     </sect2>
   </sect1>
 
@@ -2592,7 +2606,7 @@ cd /var/portbuild/<replaceable>arch</replaceable></screen>
       </listitem>
 
       <listitem>
-	<para><screen>mkdir lockfiles</screen></para>
+	<para>(Only necessary for old codebase)<screen>mkdir lockfiles</screen></para>
       </listitem>
 
       <listitem>