diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index 974d061982..07117e1912 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -189,7 +189,7 @@
       nullfs-mounted for jail builds.</para>
 
     <para>The
-      <username>ports-<replaceable>${arch}</replaceable></username>
+      <username>portbuild</username>
       user can &man.ssh.1; to the client nodes to monitor them.
       Use <command>sudo</command> and check the
       <hostid>portbuild.<replaceable>hostname</replaceable>.conf</hostid>
@@ -548,7 +548,7 @@ PKG_BIN=/usr/local/sbin/pkg</programlisting>
       </note>
 
       <para>Make sure the <replaceable>${arch}</replaceable> build
-	is run as the ports-<replaceable>${arch}</replaceable> user
+	is run as the <username>portbuild</username> user
 	or it will complain loudly.</para>
 
       <note>
@@ -1553,11 +1553,11 @@ options         NFSSERVER               # Network Filesystem Server</programlist
 	  <itemizedlist>
 	    <listitem>
 	      <para>Create a
-		<literal>ports-<replaceable>${arch}</replaceable></literal>
+		<literal>portbuild</literal>
 		user and group.  It can have the <literal>'*'</literal> password.</para>
 
 	      <para>Create
-		<filename>/home/ports-<replaceable>${arch}/.ssh/</replaceable></filename>
+		<filename>/home/portbuild/.ssh/</filename>
 		and populate <filename>authorized_keys</filename>.  </para>
 	    </listitem>
 
@@ -1837,7 +1837,7 @@ touch /tmp/.boot_finished</programlisting>
 
 	      <programlisting># local changes for package building
 %wheel        ALL=(ALL) ALL
-ports-<replaceable>${arch}</replaceable>    ALL=(ALL) NOPASSWD: ALL</programlisting>
+portbuild     ALL=(ALL) NOPASSWD: ALL</programlisting>
 	    </listitem>
 	  </itemizedlist>
 	</step>
@@ -1858,9 +1858,9 @@ ports-<replaceable>${arch}</replaceable>    ALL=(ALL) NOPASSWD: ALL</programlist
 	  <para>As root:</para>
 
 	  <screen>&prompt.root; <userinput>mkdir portbuild</userinput>
-&prompt.root; <userinput>chown ports-<replaceable>${arch}</replaceable>:ports-<replaceable>${arch}</replaceable> portbuild</userinput>
+&prompt.root; <userinput>chown portbuild:portbuild portbuild</userinput>
 &prompt.root; <userinput>mkdir pkgbuild</userinput>
-&prompt.root; <userinput>chown ports-<replaceable>${arch}</replaceable>:ports-<replaceable>${arch}</replaceable> pkgbuild</userinput>
+&prompt.root; <userinput>chown portbuild:portbuild pkgbuild</userinput>
 &prompt.root; <userinput>mkdir squid</userinput>
 &prompt.root; <userinput>mkdir squid/cache</userinput>
 &prompt.root; <userinput>mkdir squid/logs</userinput>
@@ -1894,7 +1894,7 @@ ports-<replaceable>${arch}</replaceable>    ALL=(ALL) NOPASSWD: ALL</programlist
       <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>
+	acting as <literal>portbuild</literal>
 	on the server.</para>
 
       <procedure>
@@ -1902,13 +1902,13 @@ ports-<replaceable>${arch}</replaceable>    ALL=(ALL) NOPASSWD: ALL</programlist
 	  <para>If any of the default TCP ports is not available (see
 	    above), you will need to create an <command>ssh</command>
 	    tunnel for them and include its invocation command in
-	    <literal>ports-<replaceable>${arch}</replaceable></literal>'s
+	    <literal>portbuild</literal>'s
 	    <filename>crontab</filename>.</para>
 	</step>
 
 	<step>
 	  <para>Unless you can use the defaults, add an entry to
-	    <filename>/home/ports-<replaceable>${arch}</replaceable>/.ssh/config</filename>
+	    <filename>/home/portbuild/.ssh/config</filename>
 	    to specify the public IP address, TCP port for
 	    <command>ssh</command>, username, and any other necessary
 	    information.</para>
@@ -1972,7 +1972,7 @@ MASTER_SITE_OVERRIDE= \
 http_proxy="http://localhost:3128/"
 squid_dir=<filename>/<replaceable>usr2</replaceable>/squid</filename>
 scratchdir=<filename>/<replaceable>usr2</replaceable>/pkgbuild</filename>
-client_user=ports-<replaceable>${arch}</replaceable>
+client_user=portbuild
 sudo_cmd="sudo -H"
 rsync_gzip=-z
 
@@ -2014,7 +2014,7 @@ ssh_cmd="/usr/local/bin/ssh"</programlisting>
       <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>:</para>
+	acting as <literal>portbuild</literal>:</para>
 
       <procedure>
 	<step>
@@ -2068,7 +2068,7 @@ ssh_cmd="/usr/local/bin/ssh"</programlisting>
       </procedure>
 
       <para>Finally, again as <literal>portmgr</literal>
-	acting as <literal>ports-<replaceable>arch</replaceable></literal>:</para>
+	acting as <literal>portbuild</literal>:</para>
 
       <procedure>
 	<step>
@@ -2129,7 +2129,7 @@ ssh_cmd="/usr/local/bin/ssh"</programlisting>
 
       <note>
 	<para>Again, as
-	  <literal>ports-<replaceable>arch</replaceable></literal>:</para>
+	  <literal>portbuild</literal>:</para>
       </note>
 
       <itemizedlist>
@@ -2279,7 +2279,7 @@ zfs destroy -r a/snap/src-<replaceable>old-branch</replaceable></screen>
       <itemizedlist>
 	<listitem>
 	  <para>Create a new
-	    <literal>ports-<replaceable>arch</replaceable></literal>
+	    <literal>portbuild</literal>
 	    user and group.</para>
 	</listitem>
 
@@ -2294,7 +2294,7 @@ zfs destroy -r a/snap/src-<replaceable>old-branch</replaceable></screen>
       </listitem>
 
 	<listitem>
-	  <screen>&prompt.root; chown ports-<replaceable>arch</replaceable>:portbuild /var/portbuild/<replaceable>arch</replaceable>;
+	  <screen>&prompt.root; chown portbuild:portbuild /var/portbuild/<replaceable>arch</replaceable>;
 &prompt.root; chmod 775 /var/portbuild/<replaceable>arch</replaceable>;
 &prompt.root; cd /var/portbuild/<replaceable>arch</replaceable></screen>
 	</listitem>
@@ -2306,7 +2306,7 @@ zfs destroy -r a/snap/src-<replaceable>old-branch</replaceable></screen>
 
       <note>
 	<para>The next steps are most easily done as user
-	  <literal>ports-<replaceable>arch</replaceable></literal>.</para>
+	  <literal>portbuild</literal>.</para>
       </note>
 
       <itemizedlist>