diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a74d891be..bb1a96c28 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -103,6 +103,11 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>June 7, 2004 [winkie]: Globally changed <quote>DejaGnu</quote>
+to <quote>DejaGNU</quote>.</para></listitem>
+
+<listitem><para>June 7, 2004 [winkie]: Upgraded to Vim 6.3.</para></listitem>
+
 <listitem><para>June 2, 2004 [matt]: Prologue - acknowledgments, Added Thomas
 Reitelbach as the German translator</para></listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 71a030eda..2dc446262 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -61,7 +61,7 @@
 </varlistentry>
 
 <varlistentry>
-<term>DejaGnu (&dejagnu-version;) - 1,055 KB:</term>
+<term>DejaGNU (&dejagnu-version;) - 1,055 KB:</term>
 <listitem>
 <para><ulink url="&freshmeat;dejagnu/"/></para>
 </listitem>
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index ae00bdc3d..96ebbdfa6 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -96,7 +96,7 @@ is passed to the <command>libtool</command> program, which then passes
 </variablelist>
 
 <para>Compilation is complete. Normally we would now run the test suite, but
-at this early stage the test suite framework (Tcl, Expect and DejaGnu) is not
+at this early stage the test suite framework (Tcl, Expect and DejaGNU) is not
 yet in place. And there would be little point in running the tests anyhow,
 since the programs from this first pass will soon be replaced by those from the
 second.</para>
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index 969eb36db..95b6641d3 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -3,14 +3,14 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-dejagnu" xreflabel="DejaGnu" role="wrap">
-<title>DejaGnu-&dejagnu-version;</title>
+<sect1 id="ch-tools-dejagnu" xreflabel="DejaGNU" role="wrap">
+<title>DejaGNU-&dejagnu-version;</title>
 <?dbhtml filename="dejagnu.html"?>
 
-<indexterm zone="ch-tools-dejagnu"><primary sortas="a-DejaGnu">DejaGnu</primary></indexterm>
+<indexterm zone="ch-tools-dejagnu"><primary sortas="a-DejaGNU">DejaGNU</primary></indexterm>
 
 <sect2 role="package"><title/>
-<para>The DejaGnu package contains a framework for testing other programs.</para>
+<para>The DejaGNU package contains a framework for testing other programs.</para>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -19,16 +19,16 @@
 </segmentedlist>
 
 <segmentedlist>
-<segtitle>Dejagnu installation depends on</segtitle>
+<segtitle>DejaGNU installation depends on</segtitle>
 <seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
 GCC, Glibc, Grep, Make, Sed</seg></seglistitem>
 </segmentedlist>
 </sect2>
 
 <sect2 role="installation">
-<title>Installation of DejaGnu</title>
+<title>Installation of DejaGNU</title>
 
-<para>Prepare DejaGnu for compilation:</para>
+<para>Prepare DejaGNU for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
 
@@ -39,7 +39,7 @@ GCC, Glibc, Grep, Make, Sed</seg></seglistitem>
 </sect2>
 
 
-<sect2 id="contents-dejagnu" role="content"><title>Contents of DejaGnu</title>
+<sect2 id="contents-dejagnu" role="content"><title>Contents of DejaGNU</title>
 
 <segmentedlist>
 <segtitle>Installed program</segtitle>
@@ -53,7 +53,7 @@ GCC, Glibc, Grep, Make, Sed</seg></seglistitem>
 <listitem>
 <indexterm zone="ch-tools-dejagnu runtest"><primary sortas="b-runtest">runtest</primary></indexterm>
 <para>is the wrapper script that finds the proper
-<command>expect</command> shell and then runs DejaGnu.</para>
+<command>expect</command> shell and then runs DejaGNU.</para>
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 7b5130376..3d451ce11 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -25,7 +25,7 @@
 <title>Re-installation of GCC</title>
 
 <para>The tools required to test GCC and Binutils are installed now: Tcl,
-Expect and DejaGnu. Therefore we can now rebuild GCC and Binutils, linking
+Expect and DejaGNU. Therefore we can now rebuild GCC and Binutils, linking
 them against the new Glibc, and test them properly (if running the test suites
 in this chapter). One thing to note, however, is that these test suites are
 highly dependent on properly functioning pseudo terminals (PTYs) which are
diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml
index 796fa80ee..6424c53e5 100644
--- a/chapter06/revisedchroot.xml
+++ b/chapter06/revisedchroot.xml
@@ -24,7 +24,7 @@ up and store it in a safe place, in case you want to build another LFS system
 soon.</para>
 
 <note><para>Removing <filename class="directory">/tools</filename> will also
-remove the temporary copies of Tcl, Expect and DejaGnu, which were used for
+remove the temporary copies of Tcl, Expect and DejaGNU, which were used for
 running the toolchain tests. If you want to use these programs later on, you
 will need to recompile and re-install them. The installation instructions are
 the same as in <xref linkend="chapter-temporary-tools"/>, apart from changing
diff --git a/general.ent b/general.ent
index 7bbc7c139..a3b1289ae 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!ENTITY version "CVS-20040607">
-<!ENTITY releasedate "June 7th, 2004">
+<!ENTITY releasedate "June 7, 2004">
 <!ENTITY milestone "6.0">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">