Index: general/genlib/glibmm.xml
===================================================================
--- general/genlib/glibmm.xml	(revision 5982e673488ed2e57a655ed401699fbdf250f819)
+++ general/genlib/glibmm.xml	(revision 60d59117c133309064ad7a7319063d38f6fa510b)
@@ -95,4 +95,11 @@
 
     <para>
+      First, fix the documents directory name:
+    </para>
+
+<screen><userinput>sed -e '/^libdocdir =/ s/$(book_name)/glibmm-&glibmm-version;/' \
+    -i docs/Makefile.in</userinput></screen>
+
+    <para>
       Install <application>GLibmm</application> by running the following
       commands:
@@ -132,5 +139,5 @@
         <seg>
           /usr/{include,lib}/g{io,lib}mm-2.4 and
-          /usr/share/{devhelp/books,doc}/glibmm-2.4
+          /usr/share/{devhelp/books/glibmm-2.4,doc/glibmm-&glibmm-version;}
         </seg>
       </seglistitem>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5982e673488ed2e57a655ed401699fbdf250f819)
+++ introduction/welcome/changelog.xml	(revision 60d59117c133309064ad7a7319063d38f6fa510b)
@@ -49,10 +49,15 @@
       <itemizedlist>
        <listitem>
-          <para>[bdubbs] - Update to qca-2.1.1. Fixes
-          <ulink url="&blfs-ticket-root;7182">#7182</ulink>.</para>
-        </listitem>
-       <listitem>
-          <para>[fernando] - Update to atkmm-2.24.2. Fixes
-          <ulink url="&blfs-ticket-root;7191">#7191</ulink>.</para>
+         <para>[fernando] - Some packages with doc directory not matching
+         version. Fixes
+         <ulink url="&blfs-ticket-root;7192">#7192</ulink>.</para>
+        </listitem>
+       <listitem>
+         <para>[bdubbs] - Update to qca-2.1.1. Fixes
+         <ulink url="&blfs-ticket-root;7182">#7182</ulink>.</para>
+        </listitem>
+       <listitem>
+         <para>[fernando] - Update to atkmm-2.24.2. Fixes
+         <ulink url="&blfs-ticket-root;7191">#7191</ulink>.</para>
         </listitem>
       </itemizedlist>
Index: x/lib/atkmm.xml
===================================================================
--- x/lib/atkmm.xml	(revision 5982e673488ed2e57a655ed401699fbdf250f819)
+++ x/lib/atkmm.xml	(revision 60d59117c133309064ad7a7319063d38f6fa510b)
@@ -88,4 +88,11 @@
 
     <para>
+      First, fix the documents directory name:
+    </para>
+
+<screen><userinput>sed -e '/^libdocdir =/ s/$(book_name)/atkmm-&atkmm-version;/' \
+    -i doc/Makefile.in</userinput></screen>
+
+    <para>
       Install <application>Atkmm</application> by running the following
       commands:
@@ -124,5 +131,5 @@
         <seg>
           /usr/{include,lib}/atkmm-1.6 and
-          /usr/share/{devhelp/books,doc}/atkmm-1.6
+          /usr/share/{devhelp/books/atkmm-1.6,doc/atkmm-&atkmm-version;}
         </seg>
       </seglistitem>
Index: x/lib/cairomm.xml
===================================================================
--- x/lib/cairomm.xml	(revision 5982e673488ed2e57a655ed401699fbdf250f819)
+++ x/lib/cairomm.xml	(revision 60d59117c133309064ad7a7319063d38f6fa510b)
@@ -94,4 +94,11 @@
 
     <para>
+      First, fix the documents directory name:
+    </para>
+
+<screen><userinput>sed -e '/^libdocdir =/ s/$(book_name)/cairomm-&cairomm-version;/' \
+    -i docs/Makefile.in</userinput></screen>
+
+    <para>
       Install <application>Cairomm</application> by running the following
       commands:
@@ -129,8 +136,6 @@
         </seg>
         <seg>
-          /usr/include/cairomm-1.0,
-          /usr/lib/cairomm-1.0,
-          /usr/share/devhelp/books/cairomm-1.0 and
-          /usr/share/doc/cairomm-1.0
+          /usr/{include,lib}/cairomm-1.0 and
+          /usr/share/{devhelp/books/cairomm-1.0,doc/cairomm-&cairomm-version;}
         </seg>
       </seglistitem>
Index: x/lib/gtkmm2.xml
===================================================================
--- x/lib/gtkmm2.xml	(revision 5982e673488ed2e57a655ed401699fbdf250f819)
+++ x/lib/gtkmm2.xml	(revision 60d59117c133309064ad7a7319063d38f6fa510b)
@@ -91,4 +91,11 @@
 
     <para>
+      First, fix the documents directory name:
+    </para>
+
+<screen><userinput>sed -e '/^libdocdir =/ s/$(book_name)/gtkmm-&gtkmm2-version;/' \
+    -i docs/Makefile.in</userinput></screen>
+
+    <para>
       Install <application>Gtkmm</application> by running the following
       commands:
@@ -140,7 +147,6 @@
           /usr/include/gtkmm-2.4,
           /usr/lib/gdkmm-2.4,
-          /usr/lib/gtkmm-2.4,
-          /usr/share/devhelp/books/gtkmm-2.4, and
-          /usr/share/doc/gtkmm-2.4
+          /usr/lib/gtkmm-2.4, and
+          /usr/share/{devhelp/books/gtkmm-2.4,doc/gtkmm-&gtkmm2-version;}
         </seg>
       </seglistitem>
Index: x/lib/gtkmm3.xml
===================================================================
--- x/lib/gtkmm3.xml	(revision 5982e673488ed2e57a655ed401699fbdf250f819)
+++ x/lib/gtkmm3.xml	(revision 60d59117c133309064ad7a7319063d38f6fa510b)
@@ -89,4 +89,11 @@
 
     <para>
+      First, fix the documents directory name:
+    </para>
+
+<screen><userinput>sed -e '/^libdocdir =/ s/$(book_name)/gtkmm-&gtkmm3-version;/' \
+    -i docs/Makefile.in</userinput></screen>
+
+    <para>
       Install <application>Gtkmm</application> by running the following
       commands:
@@ -126,7 +133,6 @@
           /usr/include/gtkmm-3.0,
           /usr/lib/gdkmm-3.0,
-          /usr/lib/gtkmm-3.0,
-          /usr/share/devhelp/books/gtkmm-3.0, and
-          /usr/share/doc/gtkmm-3.0
+          /usr/lib/gtkmm-3.0, and
+          /usr/share/{devhelp/books/gtkmm-3.0,doc/gtkmm-&gtkmm3-version;}
         </seg>
       </seglistitem>
Index: x/lib/pangomm.xml
===================================================================
--- x/lib/pangomm.xml	(revision 5982e673488ed2e57a655ed401699fbdf250f819)
+++ x/lib/pangomm.xml	(revision 60d59117c133309064ad7a7319063d38f6fa510b)
@@ -89,4 +89,11 @@
 
     <para>
+      First, fix the documents directory name:
+    </para>
+
+<screen><userinput>sed -e '/^libdocdir =/ s/$(book_name)/pangomm-&pangomm-version;/' \
+    -i docs/Makefile.in</userinput></screen>
+
+    <para>
       Install <application>Pangomm</application> by running the following
       commands:
@@ -125,7 +132,6 @@
         <seg>
           /usr/include/pangomm-1.4,
-          /usr/lib/pangomm-1.4,
-          /usr/share/devhelp/books/pangomm-1.4, and
-          /usr/share/doc/pangomm-1.4
+          /usr/lib/pangomm-1.4, and
+          /usr/share/{devhelp/books/pangomm-1.4,doc/pangomm-&pangomm-version;}
         </seg>
       </seglistitem>
