diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 8458745a2..a07ce920d 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="binutils-pass1.html"?>
 
   <sect1info condition="script">
-    <productname>binutils</productname>
+    <productname>binutils-pass1</productname>
     <productnumber>&binutils-version;</productnumber>
     <address>&binutils-url;</address>
   </sect1info>
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 82b3b52d0..8ff9d3574 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="binutils-pass2.html"?>
 
   <sect1info condition="script">
-    <productname>binutils</productname>
+    <productname>binutils-pass2</productname>
     <productnumber>&binutils-version;</productnumber>
     <address>&binutils-url;</address>
   </sect1info>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index c4e3910a1..e783d1883 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="gcc-pass1.html"?>
 
   <sect1info condition="script">
-    <productname>gcc</productname>
+    <productname>gcc-pass1</productname>
     <productnumber>&gcc-version;</productnumber>
     <address>&gcc-url;</address>
   </sect1info>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index b99afa41f..dfba44eb3 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="gcc-pass2.html"?>
 
   <sect1info condition="script">
-    <productname>gcc</productname>
+    <productname>gcc-pass2</productname>
     <productnumber>&gcc-version;</productnumber>
     <address>&gcc-url;</address>
   </sect1info>
diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml
index d7b6eb95f..6c3b3d27b 100644
--- a/chapter05/libstdc++.xml
+++ b/chapter05/libstdc++.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="gcc-libstdc++.html"?>
 
   <sect1info condition="script">
-    <productname>gcc</productname>
+    <productname>gcc-libstdc++</productname>
     <productnumber>&gcc-version;</productnumber>
     <address>&gcc-url;</address>
   </sect1info>
diff --git a/chapter05/linux-headers.xml b/chapter05/linux-headers.xml
index 36edc3c3d..b5f134ee3 100644
--- a/chapter05/linux-headers.xml
+++ b/chapter05/linux-headers.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="linux-headers.html"?>
 
   <sect1info condition="script">
-    <productname>linux</productname>
+    <productname>linux-headers</productname>
     <productnumber>&linux-version;</productnumber>
     <address>&linux-url;</address>
   </sect1info>
diff --git a/chapter05/python.xml b/chapter05/python.xml
index 263d3a5c3..fcca9c92c 100644
--- a/chapter05/python.xml
+++ b/chapter05/python.xml
@@ -43,6 +43,13 @@
   <sect2 role="installation">
     <title>Installation of Python</title>
 
+    <note>
+      <para>There are two package files whose name starts with
+      <quote>python</quote>. The one to extract from is
+      <filename>Python-&python-version;.tar.xz</filename> (notice the
+      uppercase first letter).</para>
+    </note>
+
     <para>This package first builds the Python interpreter, then some
     standard Python modules. The main script for building modules is
     written in Python, and uses hard-coded paths to the host <filename
diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml
index c517b8d57..1bf45bff5 100644
--- a/chapter06/linux-headers.xml
+++ b/chapter06/linux-headers.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="linux-headers.html"?>
 
   <sect1info condition="script">
-    <productname>linux</productname>
+    <productname>linux-headers</productname>
     <productnumber>&linux-version;</productnumber>
     <address>&linux-url;</address>
   </sect1info>
diff --git a/chapter06/pkgconfig.xml b/chapter06/pkgconfig.xml
index 95b837ed3..3c311e389 100644
--- a/chapter06/pkgconfig.xml
+++ b/chapter06/pkgconfig.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="pkg-config.html"?>
 
   <sect1info condition="script">
-    <productname>pkgconfig</productname>
+    <productname>pkg-config</productname>
     <productnumber>&pkgconfig-version;</productnumber>
     <address>&pkgconfig-url;</address>
   </sect1info>
diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml
index 8c4c1695e..0b163b2cb 100644
--- a/chapter07/bootscripts.xml
+++ b/chapter07/bootscripts.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="bootscripts.html"?>
 
   <sect1info condition="script">
-    <productname>lfs-bootscripts</productname>
+    <productname>bootscripts</productname>
     <productnumber>&lfs-bootscripts-version;</productnumber>
     <address>&lfs-bootscripts-url;</address>
   </sect1info>
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 2eb6857e3..20c1e8b96 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -9,7 +9,7 @@
   <?dbhtml filename="kernel.html"?>
 
   <sect1info condition="script">
-    <productname>linux</productname>
+    <productname>kernel</productname>
     <productnumber>&linux-version;</productnumber>
     <address>&linux-url;</address>
   </sect1info>