diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f2517cc96..a92ed960d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,11 @@
     <listitem>
       <para>2009-02-01</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Install DRM-related Linux headers, as suggested by
+          Chris Staub in <ulink url="&lfs-ticket-root;2307">#2307</ulink>.
+          </para>
+        </listitem>
         <listitem>
           <para>[matthew] - Added preloadable_libintl.so to list of files
           installed by Gettext. Thanks to Chris Staub for the report and patch.
diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml
index 7eb99618c..a349c804f 100644
--- a/chapter06/linux-headers.xml
+++ b/chapter06/linux-headers.xml
@@ -74,7 +74,7 @@ cp -rv dest/include/* /usr/include</userinput></screen>
       <segtitle>Installed headers</segtitle>
 
       <seglistitem>
-        <seg>/usr/include/{asm{,-generic},linux,mtd,rdma,sound,video}/*.h</seg>
+        <seg>/usr/include/{asm{,-generic},drm,linux,mtd,rdma,sound,video}/*.h</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -84,12 +84,12 @@ cp -rv dest/include/* /usr/include</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="linux-headers">
-        <term><filename class="headerfile">/usr/include/{asm{,-generic},linux,mtd,rdma,sound}/*.h</filename></term>
+        <term><filename class="headerfile">/usr/include/{asm{,-generic},drm,linux,mtd,rdma,sound,video}/*.h</filename></term>
         <listitem>
           <para>The Linux API headers</para>
           <indexterm zone="ch-system-linux-headers">
             <!-- No /*.h here to prevent a PDF line overflow -->
-            <primary sortas="e-/usr/include/{asm{,-generic},linux,mtd,rdma,sound}">/usr/include/{asm{,-generic},linux,mtd,
+            <primary sortas="e-/usr/include/{asm{,-generic},drm,linux,mtd,rdma,sound,video}">/usr/include/{asm{,-generic},drm,linux,mtd,
 rdma,sound,video}/*.h</primary>
           </indexterm>
         </listitem>