diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index 55187f0a66..ea29500b83 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -2523,11 +2523,6 @@ dopackages</command> without <literal>-nobuild</literal>.</para>
   <sect1 id="new-arch">
     <title>How to configure a new architecture</title>
 
-    <note>
-      <para>Work is underway to automate the directory creation in
-	the next section.</para>
-    </note>
-
     <sect2 id="new-arch-pre-qmanager">
       <title>Steps necessary before <application>qmanager</application> is started</title>
 
@@ -2565,6 +2560,18 @@ cd /var/portbuild/<replaceable>arch</replaceable></screen>
       <listitem>
 	<para>Create and populate the <filename>.ssh</filename> directory.</para>
       </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>The next steps are most easily done as user
+	<literal>ports-<replaceable>arch</replaceable></literal>.</para>
+    </note>
+
+    <itemizedlist>
+      <listitem>
+	<para>Create a fresh <filename>portbuild.conf</filename> file
+	  from one of the ones for another architecture.</para>
+      </listitem>
 
       <listitem>
 	<para>Create an archive directory for buildlogs and errorlogs
@@ -2595,26 +2602,17 @@ cd /var/portbuild/<replaceable>arch</replaceable></screen>
 	  </para>
 	</note>
       </listitem>
-    </itemizedlist>
 
-    <note>
-      <para>The next steps are most easily done as user
-	<literal>ports-<replaceable>arch</replaceable></literal>.</para>
-    </note>
-
-    <itemizedlist>
       <listitem>
-	<para>In the
+	<para>(Only necessary for old codebase)
+	  In the
 	  <filename>/var/portbuild/<replaceable>arch</replaceable></filename>
 	  directory:<screen>mkdir clients</screen></para>
       </listitem>
 
       <listitem>
-	<para>Populate <filename>clients</filename> as usual.</para>
-      </listitem>
-
-      <listitem>
-	<para><screen>mkdir loads</screen></para>
+	<para>(Only necessary for old codebase)
+	<screen>mkdir loads</screen></para>
       </listitem>
 
       <listitem>
@@ -2622,7 +2620,8 @@ cd /var/portbuild/<replaceable>arch</replaceable></screen>
       </listitem>
 
       <listitem>
-	<para>Create an empty <filename>mlist</filename> file.</para>
+	<para>(Only necessary for old codebase)
+	Create an empty <filename>mlist</filename> file.</para>
       </listitem>
 
       <listitem>
@@ -2635,8 +2634,20 @@ cd /var/portbuild/<replaceable>arch</replaceable></screen>
       </listitem>
 
       <listitem>
-	<para>Create a fresh <filename>portbuild.conf</filename> file
-	  from one of the ones for another architecture.</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></para>
+	  </listitem>
+	</itemizedlist>
+
+      </listitem>
+
+      <listitem>
+	<para>Populate <filename>clients</filename> as usual.</para>
       </listitem>
 
       <listitem>
@@ -2748,24 +2759,12 @@ ln -s ../<replaceable>arch</replaceable>/archive/errorlogs <replaceable>arch</re
 	<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>
-    </note>
-
-    <itemizedlist>
       <listitem>
 	<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></para>
-	  </listitem>
-
 	  <listitem>
 	    <para><link linkend="setup">Create
 	      <filename>bindist.tar</filename></link>.</para>
@@ -2773,13 +2772,7 @@ ln -s ../<replaceable>arch</replaceable>/archive/errorlogs <replaceable>arch</re
 	</itemizedlist>
 
       </listitem>
-    </itemizedlist>
 
-    <note>
-      <para>One last time using <application>sudo</application>:</para>
-    </note>
-
-    <itemizedlist>
       <listitem>
         <para>(Only necessary for old codebase):
 	  Only after the first time a