diff --git a/basicnet/netprogs/cvs.xml b/basicnet/netprogs/cvs.xml
index f2feca79cd..64a38d5838 100644
--- a/basicnet/netprogs/cvs.xml
+++ b/basicnet/netprogs/cvs.xml
@@ -40,9 +40,9 @@ repository, creation of a repository is covered at <xref linkend="cvsserver"/>.
 <xref linkend="gdbm"/>,
 <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
 <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
-<xref linkend="gs"/> or <xref linkend="epsgs"/>,
+<xref linkend="gs"/> or <xref linkend="espgs"/>,
 <ulink url="../server/mail.html">MTA</ulink> and
-<xref linkend="vim"/>
+<xref linkend="postlfs-editors-vim"/>
 </para></sect4>
 </sect3>