diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 687d213a3..fcc4b7a9e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -114,6 +114,11 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>December 13, 2005 [jhuntwork]: Install Tcl's internal headers to /tools/include,
+allowing us to drop its source directory right away. Origin is Greg Schafer, and thanks to
+Dan Nicholson for the report (fixes bug 1670).</para>
+</listitem>
+
 <listitem><para>December 12, 2005 [jhuntwork]: Updated texinfo patch. Fixes segfault issues with
 texindex. Thanks to Randy McMurchy for the report and Bruce Dubbs and Joe Ciccone for the fix.</para>
 </listitem>
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 7ba3c7119..32662380c 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -37,7 +37,7 @@ suite run:</para>
 <para>Now prepare Expect for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
-   --with-tclinclude=$TCLPATH --with-x=no</userinput></screen>
+   --with-tclinclude=/tools/include --with-x=no</userinput></screen>
 
 <para>The meaning of the configure options:</para>
 
@@ -50,11 +50,10 @@ one on the host system.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><parameter>--with-tclinclude=$TCLPATH</parameter></term>
-<listitem><para>This explicitly tells Expect where to find Tcl's source
-directory and internal headers. Using this option avoids conditions
-where <command>configure</command> fails because it cannot automatically
-discover the location of the Tcl source directory.</para></listitem>
+<term><parameter>--with-tclinclude=/tools/include</parameter></term>
+<listitem><para>This explicitly tells Expect where to find Tcl's internal headers.
+Using this option avoids conditions where <command>configure</command> fails because
+it cannot automatically discover the location of Tcl's headers.</para></listitem>
 </varlistentry>
 
 <varlistentry>
@@ -90,12 +89,6 @@ scripts, which are not needed.</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para>Now remove the <envar>TCLPATH</envar> variable:</para>
-
-<screen><userinput>unset TCLPATH</userinput></screen>
-
-<para>The source directories of both Tcl and Expect can now be removed.</para>
-
 </sect2>
 
 <sect2 id="contents-expect" role="content"><title>Contents of Expect</title>
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index f0f7dd868..3787a3d95 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -66,15 +66,9 @@ Details on the <envar>TZ</envar> environment variable are provided in
 
 <screen><userinput>make install</userinput></screen>
 
-<warning><para><emphasis>Do not</emphasis> remove the
-<filename class="directory">tcl&tcl-version;</filename> source directory yet, as the next package
-will need its internal headers.</para></warning>
+<para>Install Tcl's headers. The next package, Expect, requires them to build.</para>
 
-<para>Set a variable containing the full path of the current directory.
-The next package, Expect, will use this variable to find Tcl's headers.</para>
-
-<screen><userinput>cd ..
-export TCLPATH=`pwd`</userinput></screen>
+<screen><userinput>make install-private-headers</userinput></screen>
 
 <para>Now make a necessary symbolic link:</para>