diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f6d7387a5..61d861519 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -91,6 +91,9 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>June 25th, 2005 [archaic]: Added "generic-version" and
+"test-results" entities.</para></listitem>
+
 <listitem><para>June 25th, 2005 [matthew]: Updated to the latest version of the
 mktemp tempfile patch, which supports building outside the source directory</para></listitem>
 
diff --git a/chapter04/abouttestsuites.xml b/chapter04/abouttestsuites.xml
index fa57d9608..dbcbabfc9 100644
--- a/chapter04/abouttestsuites.xml
+++ b/chapter04/abouttestsuites.xml
@@ -42,9 +42,8 @@ correctly. This issue is discussed in greater detail in <xref
 linkend="chapter-temporary-tools"/>.</para>
 
 <para>Sometimes package test suites will give false failures. Consult the logs
-located at <ulink url="http://linuxfromscratch.org/~archaic/logs-svn/"/> to
-verify whether or not these failures are expected. This site is valid for all
-tests throughout this book.</para>
+located at <ulink url="&test-results;"/> to verify whether or not these failures
+are expected. This site is valid for all tests throughout this book.</para>
 
 </sect1>
 
diff --git a/general.ent b/general.ent
index 7e3ed14f3..d9ed812ac 100644
--- a/general.ent
+++ b/general.ent
@@ -2,6 +2,7 @@
 <!ENTITY version "SVN-20050625">
 <!ENTITY releasedate "June 25, 2005">
 <!ENTITY milestone "6.2">
+<!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
 <!ENTITY blfs-root "&lfs-root;blfs/">
@@ -10,6 +11,7 @@
 <!ENTITY hints-index "&lfs-root;hints/list.html">
 <!ENTITY patches-root "&lfs-root;patches/lfs/svn/trunk/">
 <!ENTITY wiki-root "http://wiki.linuxfromscratch.org/">
+<!ENTITY test-results "http://linuxfromscratch.org/~archaic/logs-&generic-version;/">
 
 <!ENTITY buildtime "Approximate build time">
 <!ENTITY diskspace "Required disk space">