Index: BOOK/final-system/common/systemd.xml
===================================================================
--- BOOK/final-system/common/systemd.xml	(revision 42ff691d8ba2bea7f5c6b19d8842130b3cc3e7d1)
+++ BOOK/final-system/common/systemd.xml	(revision 49da1d59e4dfaa4997094145fa04533d1fe647a1)
@@ -25,4 +25,9 @@
     <title>Installation of systemd</title>
 
+    <para os="p1">Apply a patch so that compat <command>pkg-config</command>
+    files get installed without installing compat libraries:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
+
     <para os="a">Prepare Systemd for compilation:</para>
 
@@ -32,5 +37,8 @@
     --with-rootprefix="" --with-rootlibdir=/lib \
     --enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
-    --with-kbd-setfont=/bin/setfont</userinput></screen>
+    --with-kbd-setfont=/bin/setfont --with-dbuspolicydir=/etc/dbus-1/system.d \
+    --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
+    --with-dbussessionservicedir=/usr/share/dbus-1/services \
+    --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
 
     <variablelist os="c">
@@ -63,4 +71,11 @@
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--with-dbus*</parameter></term>
+        <listitem>
+          <para>These switches ensure that D-Bus configuration files get
+          installed to the correct locations.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
@@ -71,7 +86,11 @@
     <para os="f">Prevent a broken test case from running:</para>
 
-<screen os="g"><userinput remap="test">sed -i s:test/udev-test.pl::g Makefile</userinput></screen>
-
-    <para os="h">Test test the results, issue:</para>
+<screen os="g"><userinput remap="test">
+sed -e "s:test/udev-test.pl::g Makefile" \
+    -e "s:test-bus-cleanup\$(EXEEXT) ::g" \
+    -e "s:test-bus-gvariant\$(EXEEXT) ::g" \
+    -i Makefile</userinput></screen>
+
+    <para os="h">Test the results, issue:</para>
 
 <screen os="i"><userinput remap="test">make check</userinput></screen>
Index: BOOK/final-system/multilib/systemd-64bit.xml
===================================================================
--- BOOK/final-system/multilib/systemd-64bit.xml	(revision 42ff691d8ba2bea7f5c6b19d8842130b3cc3e7d1)
+++ BOOK/final-system/multilib/systemd-64bit.xml	(revision 49da1d59e4dfaa4997094145fa04533d1fe647a1)
@@ -23,4 +23,12 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -31,5 +39,8 @@
     --with-rootprefix="" -with-rootlibdir=/lib64 \
     --enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
-    --with-kbd-setfont=/bin/setfont</userinput></screen>
+    --with-kbd-setfont=/bin/setfont --with-dbuspolicydir=/etc/dbus-1/system.d \
+    --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
+    --with-dbussessionservicedir=/usr/share/dbus-1/services \
+    --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -44,4 +55,20 @@
     href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/systemd-n32.xml
===================================================================
--- BOOK/final-system/multilib/systemd-n32.xml	(revision 42ff691d8ba2bea7f5c6b19d8842130b3cc3e7d1)
+++ BOOK/final-system/multilib/systemd-n32.xml	(revision 49da1d59e4dfaa4997094145fa04533d1fe647a1)
@@ -27,4 +27,12 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="systemd.xml"
     xpointer="xpointer(//*[@os='a'])"/>
@@ -36,5 +44,8 @@
     --with-rootprefix="" -with-rootlibdir=/lib32 \
     --enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
-    --with-kbd-setfont=/bin/setfont</userinput></screen>
+    --with-kbd-setfont=/bin/setfont --with-dbuspolicydir=/etc/dbus-1/system.d \
+    --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
+    --with-dbussessionservicedir=/usr/share/dbus-1/services \
+    --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -45,4 +56,20 @@
     href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/systemd.xml
===================================================================
--- BOOK/final-system/multilib/systemd.xml	(revision 42ff691d8ba2bea7f5c6b19d8842130b3cc3e7d1)
+++ BOOK/final-system/multilib/systemd.xml	(revision 49da1d59e4dfaa4997094145fa04533d1fe647a1)
@@ -33,4 +33,12 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -41,5 +49,8 @@
     --with-rootprefix="" --with-rootlibdir=/lib \
     --enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
-    --with-kbd-setfont=/bin/setfont</userinput></screen>
+    --with-kbd-setfont=/bin/setfont --with-dbuspolicydir=/etc/dbus-1/system.d \
+    --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
+    --with-dbussessionservicedir=/usr/share/dbus-1/services \
+    --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -50,4 +61,20 @@
     href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
