diff --git a/general/genutils/highlight.xml b/general/genutils/highlight.xml
index 63ddeae989..070d80f24f 100644
--- a/general/genutils/highlight.xml
+++ b/general/genutils/highlight.xml
@@ -111,7 +111,7 @@
       following command:
     </para>
 
-<screen><userinput>make gui</userinput></screen>
+<screen><userinput>make gui doc_dir=/usr/share/doc/highlight-&highlight-version;/</userinput></screen>
 <!--
     <para>
       To build the API documentation, run the following command:
@@ -129,7 +129,7 @@
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install doc_dir=/usr/share/doc/highlight-&highlight-version;/</userinput></screen>
 
     <para>
       To install the GUI program, run the following command as the
@@ -147,6 +147,17 @@
 -->
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>doc_dir=/usr/share/doc/highlight-&highlight-version;</parameter>:
+      install highlight documentation into a versioned directory. This
+      parameter is also needed for <command>make gui</command>, because
+      its value would be hardcoded into the gui executable.
+	</para>
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 
@@ -164,7 +175,7 @@
         </seg>
         <seg>
           /etc/highlight,
-          /usr/share/doc/highlight, and
+          /usr/share/doc/highlight/&highlight-version;, and
           /usr/share/highlight
         </seg>
       </seglistitem>
diff --git a/general/graphlib/librsvg.xml b/general/graphlib/librsvg.xml
index 1e852cd285..f16629e60f 100644
--- a/general/graphlib/librsvg.xml
+++ b/general/graphlib/librsvg.xml
@@ -107,7 +107,8 @@
 
 <screen><userinput>./configure --prefix=/usr    \
             --enable-vala    \
-            --disable-static &amp;&amp;
+            --disable-static \
+            --docdir=/usr/share/doc/librsvg-&librsvg-version; &amp;&amp;
 make</userinput></screen>
 
     <para>
diff --git a/general/sysutils/systemd.xml b/general/sysutils/systemd.xml
index ea737e146e..4ef0fe1e2e 100644
--- a/general/sysutils/systemd.xml
+++ b/general/sysutils/systemd.xml
@@ -188,6 +188,7 @@ meson --prefix=/usr                 \
       -Db_lto=false                 \
       -Dhomed=false                 \
       -Duserdb=false                \
+      -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
       ..                            &amp;&amp;
 
 ninja</userinput></screen>
diff --git a/multimedia/libdriv/flac.xml b/multimedia/libdriv/flac.xml
index 48a2cc8aec..9b0717c8be 100644
--- a/multimedia/libdriv/flac.xml
+++ b/multimedia/libdriv/flac.xml
@@ -97,7 +97,8 @@
     </para>
 
 <screen><userinput>./configure --prefix=/usr \
-            --disable-thorough-tests &amp;&amp;
+            --disable-thorough-tests \
+            --docdir=/usr/share/doc/flac-&flac-version; &amp;&amp;
 make</userinput></screen>
 
     <para>
diff --git a/postlfs/filesystems/ntfs-3g.xml b/postlfs/filesystems/ntfs-3g.xml
index ba0cb62e5d..3584643961 100644
--- a/postlfs/filesystems/ntfs-3g.xml
+++ b/postlfs/filesystems/ntfs-3g.xml
@@ -115,7 +115,8 @@
 
 <screen><userinput>./configure --prefix=/usr        \
             --disable-static     \
-            --with-fuse=internal &amp;&amp;
+            --with-fuse=internal \
+            --docdir=/usr/share/doc/ntfs-3g-&ntfs-3g-version; &amp;&amp;
 make</userinput></screen>
 
     <para>
diff --git a/x/installing/libXdmcp.xml b/x/installing/libXdmcp.xml
index 67632a5b61..6209764d42 100644
--- a/x/installing/libXdmcp.xml
+++ b/x/installing/libXdmcp.xml
@@ -98,7 +98,7 @@
       commands:
     </para>
 
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
+<screen><userinput>./configure $XORG_CONFIG --docdir=/usr/share/doc/libXdmcp-&libXdmcp-version; &amp;&amp;
 make</userinput></screen>
 
     <para>