diff --git a/general.ent b/general.ent
index 66b27c9efa..7faf2d8193 100644
--- a/general.ent
+++ b/general.ent
@@ -1,8 +1,8 @@
-<!ENTITY day          "02">
+<!ENTITY day          "04">
 <!ENTITY month        "10">
 <!ENTITY year         "2004">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "Ocotober &day;nd, &year;">
+<!ENTITY releasedate  "October &day;th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "cvs">                  <!-- cvs|[release #] -->
 <!ENTITY lfs-version  "testing">              <!-- stable|testing|unstable] -->
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index cadd9e8eb1..1e00540724 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -22,6 +22,10 @@ who wrote what.</para>
 
 <itemizedlist>
 
+<listitem><para>October 4th, 2004 [igor]: Fixed replaceable tags and
+removed a redundant CVSROOT export on the cvsserver
+page.</para></listitem>
+
 <listitem><para>October 2nd, 2004 [dj]: Added net-tools as a dependency
 for RP-PPPoE.  Made iproute2 patch optional for dhcp.</para></listitem>
 
diff --git a/server/other/cvsserver.xml b/server/other/cvsserver.xml
index 3abeacf3de..034062f820 100644
--- a/server/other/cvsserver.xml
+++ b/server/other/cvsserver.xml
@@ -54,9 +54,8 @@ cvs init</command></userinput></screen></sect3>
 commands, issued from a user account on the same machine as the 
 <acronym>CVS</acronym> repository:</para>
 
-<screen><userinput><command>export CVSROOT=/srv/cvsroot &amp;&amp;
-cd <replaceable>[sourcedir]</replaceable> &amp;&amp;
-cvs import -m <replaceable>["repository test"] [cvstest] [vendortag] [releasetag]</replaceable></command></userinput></screen></sect3>
+<screen><userinput><command>cd <replaceable>[sourcedir]</replaceable> &amp;&amp;
+cvs import -m "<replaceable>[repository test]</replaceable>" <replaceable>[cvstest]</replaceable> <replaceable>[vendortag]</replaceable> <replaceable>[releasetag]</replaceable></command></userinput></screen></sect3>
 
 <sect3><title>3. Verify local repository access.</title>
 <para>Test access to the <acronym>CVS</acronym> repository from the same user