diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 15f3a873a2..67b1f2e688 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -716,7 +716,7 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
 	    <para>Check out the &os.stable; version of the
 	      <filename>shazam</filename> module:</para>
 
-	    <screen>&prompt.user; <userinput>cvs co -rRELENG_4 shazam</userinput></screen>
+	    <screen>&prompt.user; <userinput>cvs co -rRELENG_5 shazam</userinput></screen>
 	  </listitem>
 
 	  <listitem>
@@ -727,11 +727,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
 	</itemizedlist>
 
 	<para>You will almost certainly get a conflict because
-	  of the <literal>$Id: article.sgml,v 1.217 2004-11-29 21:43:33 ceri Exp $</literal> (or in FreeBSD's case,
+	  of the <literal>$Id: article.sgml,v 1.218 2004-12-08 12:41:41 josef Exp $</literal> (or in FreeBSD's case,
 	  <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
 	  lines, so you will have to edit the file to resolve the conflict
-	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.217 2004-11-29 21:43:33 ceri Exp $</literal> line,
-	  leaving the original <literal>$Id: article.sgml,v 1.217 2004-11-29 21:43:33 ceri Exp $</literal> line intact).</para>
+	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.218 2004-12-08 12:41:41 josef Exp $</literal> line,
+	  leaving the original <literal>$Id: article.sgml,v 1.218 2004-12-08 12:41:41 josef Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -983,7 +983,7 @@ checkout -P</programlisting>
 	  properly (tabs often look wrong in diffs because of the extra
 	  character in front of each line).</para>
 
-	<para><ulink url="http://people.FreeBSD.org/~eivind/cdiff"></ulink></para>
+	<para><filename role="package">textproc/cdiff</filename></para>
 
 	<para>Simply use it instead of &man.more.1; or &man.less.1;:</para>