diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index 033244bf9c..8ee914551e 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -2958,56 +2958,43 @@ sysutils/zfs-stats</screen>
 
     </sect2>
 
-    <sect2 id="pointyhat-portbuild-volume">
-      <title>Configuring the portbuild volume</title>
+    <sect2 id="pointyhat-zfs-volume">
+      <title>Configuring the zfs volume</title>
+
+      <para>The following steps need to be done as euid root.</para>
 
       <procedure>
 
 	<step>
-	  <para>Create <filename>/a</filename>.</para>
+	  <para>Pick a <application>zfs</application> volume name and export
+	    it.  We have used <replaceable>a</replaceable> so far to date.
+	    <programlisting>&prompt.root; export ZFS_VOLUME=<replaceable>a</replaceable></programlisting>
+	  </para>
 	</step>
 
 	<step>
-	  <para>Create a <application>zfs</application> volume named
-	    <filename>a</filename> and mount it on
-	    <filename>/a</filename>.</para>
+	  <para>Pick a mountpoint and export it.  We have used
+	    <filename>/<replaceable>a</replaceable></filename> so far to date.
+	    <programlisting>&prompt.root; export ZFS_MOUNTPOINT=/<replaceable>a</replaceable></programlisting>
+	  </para>
+	</step>
+
+	<step>
+	  <para>Create the mountpoint.</para>
+	    <programlisting>&prompt.root; mkdir -p /<replaceable>a</replaceable></programlisting>
+	</step>
+
+	<step>
+	  <para>Create the <application>zfs</application> volume
+	    and mount it.</para>
 
 	  <example>
 	    <title>Creating a <application>zfs</application> volume for portbuild</title>
 
-<screen>&prompt.root; zpool create a mirror da1 da2 mirror da3 da4 mirror da5 da6 mirror da7 da8</screen>
+<screen>&prompt.root; zpool create <replaceable>a</replaceable> mirror da1 da2 mirror da3 da4 mirror da5 da6 mirror da7 da8</screen>
 	  </example>
 	</step>
 
-	<step>
-	  <para>Create the <filename>portbuild</filename> directory:<screen>
-&prompt.root; mkdir -p /a/portbuild
-</screen>
-	  </para>
-	</step>
-
-	<step>
-	  <para>Create and mount a new <application>zfs</application>
-	    filesystem on it:
-	    <screen>zfs create -o mountpoint=/a/portbuild a/portbuild</screen>
-	  </para>
-	</step>
-
-	<step>
-	  <para>Set up the directory:<screen>
-&prompt.root; cd /a/portbuild
-&prompt.root; chown portbuild:portbuild .
-&prompt.root; chmod 775 .
-&prompt.root; ln -sf /a/portbuild /var/portbuild
-</screen>
-	  </para>
-
-	  <note>
-	    <para>The <command>ln</command> is necessary due to a number
-	      of hardcoded paths.  This is a bug.</para>
-	  </note>
-	</step>
-
       </procedure>
 
     </sect2>
@@ -3017,6 +3004,35 @@ sysutils/zfs-stats</screen>
 
       <procedure>
 
+	<step>
+	  <para>Create the <filename>portbuild</filename> directory:<screen>
+&prompt.root; mkdir -p /<replaceable>a</replaceable>/portbuild
+</screen>
+	  </para>
+	</step>
+
+	<step>
+	  <para>Create and mount a new <application>zfs</application>
+	    filesystem on it:
+	    <screen>zfs create -o mountpoint=/<replaceable>a</replaceable>/portbuild <replaceable>a</replaceable>/portbuild</screen>
+	  </para>
+	</step>
+
+	<step>
+	  <para>Set up the directory:<screen>
+&prompt.root; cd /<replaceable>a</replaceable>/portbuild
+&prompt.root; chown <replaceable>portbuild</replaceable>:<replaceable>portbuild</replaceable> .
+&prompt.root; chmod 775 .
+&prompt.root; ln -sf /<replaceable>a</replaceable>/portbuild /var/portbuild
+</screen>
+	  </para>
+
+	  <note>
+	    <para>The <command>ln</command> is necessary due to a number
+	      of hardcoded paths.  This is a bug.</para>
+	  </note>
+	</step>
+
 	<step>
 	  <para>Set up an account with subversion config files
 	    installed.  Again, we generally use
@@ -3025,7 +3041,7 @@ sysutils/zfs-stats</screen>
 
 	<step>
 	  <para>As that user, set up the repository:<screen>
-&prompt.user; svn checkout svn://svn.freebsd.org/base/projects/portbuild /a/portbuild
+&prompt.user; svn checkout svn://svn.freebsd.org/base/projects/portbuild /<replaceable>a</replaceable>/portbuild
 </screen>
 	    </para>
 	</step>
@@ -3033,7 +3049,7 @@ sysutils/zfs-stats</screen>
 	<step>
 	  <para>Configure how build slaves will talk to your server
 	    by making the following changes to
-	    <filename>/var/portbuild/conf/client.conf</filename>:</para>
+	    <filename>/<replaceable>a</replaceable>/portbuild/conf/client.conf</filename>:</para>
 
 	  <itemizedlist>
 
@@ -3061,14 +3077,14 @@ sysutils/zfs-stats</screen>
 
 	<step>
 	  <para>Most of the default values in
-	    <filename>/var/portbuild/conf/common.conf</filename>
+	    <filename>/<replaceable>a</replaceable>/portbuild/conf/common.conf</filename>
 	    should be fine.  This file holds definitions used by
 	    both the server and all its clients.</para>
 	</step>
 
 	<step>
 	  <para>Configure the server by making the following changes to
-	    <filename>/var/portbuild/conf/server.conf</filename>:</para>
+	    <filename>/<replaceable>a</replaceable>/portbuild/conf/server.conf</filename>:</para>
 
 	  <itemizedlist>
 
@@ -3086,6 +3102,12 @@ sysutils/zfs-stats</screen>
 		<makevar>SRC_BRANCHES_PATTERN</makevar>.</para>
 	    </listitem>
 
+	    <listitem>
+	      <para>Set <makevar>ZFS_VOLUME</makevar> and
+		<makevar>ZFS_MOUNTPOINT</makevar> to whatever you
+		chose above.</para>
+	    </listitem>
+
 	    <listitem>
 	      <para>Set <makevar>UPLOAD_DIRECTORY</makevar>,
 		<makevar>UPLOAD_TARGET</makevar>, and