diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index 31661b9240..d5126b732b 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -2220,11 +2220,14 @@ ssh_cmd="/usr/local/bin/ssh"
   <sect1 id="new-branch">
     <title>How to configure a new &os; branch</title>
 
+    <sect2 id="new-branch-pre-qmanager">
+      <title>Steps necessary before <application>qmanager</application> is started</title>
+
+<!-- start of whitespace-broken area -->
+
     <para>When a new branch is created, some work needs to
       be done to specify that the previous branch is no longer
-      equivalent to <literal>HEAD</literal>.  The following
-      instructions apply to the <emphasis>previous</emphasis>
-      branch number:</para>
+      equivalent to <literal>HEAD</literal>.</para>
 
     <itemizedlist>
       <listitem>
@@ -2323,16 +2326,44 @@ ln -s ../<replaceable>arch</replaceable>/<replaceable>branch</replaceable>/build
 	</para>
       </listitem>
 
-      <listitem>
-	<para>Kick-start the build for the branch with
-	  <screen>build create <replaceable>arch</replaceable> <replaceable>branch</replaceable></screen></para>
-      </listitem>
+    </itemizedlist>
 
+<!-- end of whitespace-broken area -->
+    </sect2>
+
+    <sect2 id="new-branch-post-qmanager">
+      <title>Steps necessary after <application>qmanager</application> is started</title>
+
+<!-- start of whitespace-broken area -->
+
+    <note>
+      <para>Again, as
+	<literal>ports-<replaceable>arch</replaceable></literal>:</para>
+    </note>
+
+    <itemizedlist>
       <listitem>
-	<para><link linkend="setup">Create <filename>bindist.tar</filename>
-	  </link>.</para>
+	<para>For each branch that will be supported, do the following:
+	</para>
+
+	<itemizedlist>
+	  <listitem>
+	    <para>Kick-start the build for the branch with
+	      <screen>build create <replaceable>arch</replaceable> <replaceable>branch</replaceable></screen>
+	  </listitem>
+
+	  <listitem>
+	    <para><link linkend="setup">Create
+	      <filename>bindist.tar</filename></link>.</para>
+	  </listitem>
+	</itemizedlist>
+
       </listitem>
     </itemizedlist>
+
+<!-- end of whitespace-broken area -->
+    </sect2>
+
   </sect1>
 
   <sect1 id="old-branch">
@@ -2462,6 +2493,11 @@ dopackages</command> without <literal>-nobuild</literal>.</para>
   <sect1 id="new-arch">
     <title>How to configure a new architecture</title>
 
+    <sect2 id="new-arch-pre-qmanager">
+      <title>Steps necessary before <application>qmanager</application> is started</title>
+
+<!-- start of whitespace-broken area -->
+
     <note>
       <para>The initial steps need to be done using
 	<application>sudo</application>.</para>
@@ -2497,6 +2533,7 @@ cd /var/portbuild/<replaceable>arch</replaceable></screen>
 
       <listitem>
 	<para>Create a directory for buildlogs and errorlogs:
+	  (XXX MCL specific to pointyhat; fix this!)
 	  <screen>mkdir /dumpster/pointyhat/<replaceable>arch</replaceable>/archive</screen>
 	</para>
 
@@ -2512,6 +2549,7 @@ cd /var/portbuild/<replaceable>arch</replaceable></screen>
 
       <listitem>
 	<para>Create a link to the above for the webserver:
+	  (XXX MCL specific to pointyhat; fix this!)
 	  <screen>ln -s /dumpster/pointyhat/<replaceable>arch</replaceable>/archive archive</screen>
 	</para>
       </listitem>
@@ -2581,7 +2619,7 @@ cd /var/portbuild/<replaceable>arch</replaceable></screen>
       </listitem>
 
       <listitem>
-	<para>Make the private configuration directory:
+	<para>If needed, make the private configuration directory:
 	  <screen>mkdir /var/portbuild/conf/<replaceable>arch</replaceable></screen>
 	</para>
       </listitem>
@@ -2597,11 +2635,6 @@ cd /var/portbuild/<replaceable>arch</replaceable></screen>
     </note>
 
     <itemizedlist>
-      <listitem>
-	<para>Tell <application>qmanager</application> about the arch:
-	  <screen>python <replaceable>path</replaceable>/qmanager/qclient add_acl name=ports-<replaceable>arch</replaceable> uidlist=ports-<replaceable>arch</replaceable> gidlist=portmgr sense=1</screen></para>
-      </listitem>
-
       <listitem>
         <para>(Only necessary for new codebase):
 	  Add <replaceable>arch</replaceable> to <makevar>SUPPORTED_ARCHS</makevar> in
@@ -2642,6 +2675,37 @@ ln -s ../<replaceable>arch</replaceable>/archive/errorlogs <replaceable>arch</re
       </listitem>
     </itemizedlist>
 
+    <note>
+      <para>One last time using <application>sudo</application>:</para>
+    </note>
+
+    <itemizedlist>
+      <listitem>
+	<para>Add an appropriate <replaceable>arch</replaceable> entry for
+	  <filename>/var/portbuild/scripts/dologs</filename> to the root
+	  <filename>crontab</filename>.  (This is a hack and should go away.)
+	</para>
+    </itemizedlist>
+
+<!-- end of whitespace-broken area -->
+    </sect2>
+
+    <sect2 id="new-arch-post-qmanager">
+      <title>Steps necessary after <application>qmanager</application> is started</title>
+
+<!-- start of whitespace-broken area -->
+
+    <note>
+      <para>Again using <application>sudo</application>:</para>
+    </note>
+
+    <itemizedlist>
+      <listitem>
+	<para>Tell <application>qmanager</application> about the arch:
+	  <screen>python <replaceable>path</replaceable>/qmanager/qclient add_acl name=ports-<replaceable>arch</replaceable> uidlist=ports-<replaceable>arch</replaceable> gidlist=portmgr sense=1</screen></para>
+      </listitem>
+    </itemizedlist>
+
     <note>
       <para>Again, as
 	<literal>ports-<replaceable>arch</replaceable></literal>:</para>
@@ -2679,19 +2743,20 @@ ln -s ../<replaceable>arch</replaceable>/archive/errorlogs <replaceable>arch</re
 	  arch: add the arch to
 	  <filename>/var/portbuild/scripts/dopackagestats</filename>.</para>
       </listitem>
-
-      <listitem>
-	<para>Add an appropriate <replaceable>arch</replaceable> entry for
-	  <filename>/var/portbuild/scripts/dologs</filename> to the root
-	  <filename>crontab</filename>.  (This is a hack and should go away.)
-	</para>
-      </listitem>
     </itemizedlist>
+
+<!-- end of whitespace-broken area -->
+
+    </sect2>
+
   </sect1>
 
   <sect1 id="new-head-node">
     <title>How to configure a new head node (pointyhat instance)</title>
 
+    <para>This section only applies to the new codebase.  New installations
+      using the old codebase are <emphasis>not</emphasis> supported.</para>
+
     <para>This section is in progress.</para>
 
     <para>Please talk to Mark Linimon before making any changes.</para>