diff --git a/en_US.ISO8859-1/articles/portbuild/article.xml b/en_US.ISO8859-1/articles/portbuild/article.xml
index a984c6b4f1..9ced572929 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.xml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
@@ -204,10 +204,10 @@
       tree and installs it into
       <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable>/bindist.tar</filename>.
       The tree will
-      be updated first unless <literal>-nocvs</literal> is
+      be updated first unless <literal>-novcs</literal> is
       specified.  It should be run as <username>root</username>:</para>
 
-    <screen>/var/portbuild&prompt.root; <userinput>scripts/makeworld <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> [-nocvs]</userinput></screen>
+    <screen>/var/portbuild&prompt.root; <userinput>scripts/makeworld <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> [-novcs]</userinput></screen>
 
     <para>The <filename>bindist.tar</filename> tarball is created from the
       previously installed world by the <command>mkbindist</command>
@@ -558,9 +558,9 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
       </listitem>
 
       <listitem>
-	<para><literal>-srccvs</literal> - Do not update the
+	<para><literal>-srcvcs</literal> - Do not update the
 	  <literal>src</literal> tree from the ZFS snapshot, update it with
-	  <literal>cvs update</literal> instead.
+	  a fresh checkout instead.
 	</para>
       </listitem>
 
@@ -572,9 +572,9 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
       </listitem>
 
       <listitem>
-	<para><literal>-portscvs</literal> - Do not update the
+	<para><literal>-portsvcs</literal> - Do not update the
 	  <literal>ports</literal> tree from the ZFS snapshot, update it with
-	  <literal>cvs update</literal> instead.
+	  a fresh checkout instead.
 	</para>
       </listitem>
 
@@ -1095,7 +1095,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
       <listitem>
 	<para><literal>missing</literal> shows the difference between
 	  <filename>INDEX</filename> and the other columns.  If you have
-	  restarted a run after a <command>cvs update</command>, there
+	  restarted a run after a ports tree update, there
 	  will likely be duplicates in the packages and error columns,
 	  and this column will be meaningless.  (The script is naive).</para>
       </listitem>
@@ -1137,8 +1137,8 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
     <para>When building packages for a release, it may be
       necessary to manually update the <literal>ports</literal>
       and <literal>src</literal> trees to the release tag and use
-      <literal>-nocvs</literal> and
-      <literal>-noportscvs</literal>.</para>
+      <literal>-novcs</literal> and
+      <literal>-noportsvcs</literal>.</para>
 
     <para>To build package sets intended for use on a CD-ROM,
       use the <literal>-cdrom</literal> option to
@@ -1431,7 +1431,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
     <para>The following command will set up the control branch for
       the partial build (old codebase):</para>
 
-    <screen>&prompt.user; <userinput>/var/portbuild/scripts/dopackages.8 -noportscvs -nobuild -nocvs -nofinish</userinput></screen>
+    <screen>&prompt.user; <userinput>/var/portbuild/scripts/dopackages.8 -noportsvcs -nobuild -novcs -nofinish</userinput></screen>
 
     <!-- XXX MCL obsolete -->
     <para>The builds must be performed from the