diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 419f8d7eb..edb9426cf 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,12 @@
     <listitem>
       <para>2011-11-25</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Install Glibc's NIS and RPC headers again.  The
+          headers have not been installed by default since Glibc-2.14, but that
+          causes various BLFS packages to break. Fixes
+          <ulink url="&lfs-ticket-root;2965">#2965</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Grep-2.10. Fixes
           <ulink url="&lfs-ticket-root;2964">#2964</ulink>.</para>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 819bcdb95..7787da2d2 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -221,6 +221,13 @@ grep Error glibc-check-log</userinput></screen>
 
 <screen><userinput remap="install">make install</userinput></screen>
 
+    <para>Install NIS and RPC related headers that are not installed by
+    default; these are required by several BLFS packages:</para>
+
+<screen><userinput remap="install">cp -v ../glibc-&glibc-version;/sunrpc/rpc/*.h /usr/include/rpc
+cp -v ../glibc-&glibc-version;/sunrpc/rpcsvc/*.h /usr/include/rpcsvc
+cp -v ../glibc-&glibc-version;/nis/rpcsvc/*.h /usr/include/rpcsvc</userinput></screen>
+
     <para>The locales that can make the system respond in a different language
     were not installed by the above command. None of the locales are required,
     but if some of them are missing, test suites of the future packages would