diff --git a/multimedia/libdriv/libcanberra.xml b/multimedia/libdriv/libcanberra-systemd.xml
similarity index 100%
rename from multimedia/libdriv/libcanberra.xml
rename to multimedia/libdriv/libcanberra-systemd.xml
diff --git a/multimedia/libdriv/libdriv.xml b/multimedia/libdriv/libdriv.xml
index 41d6a5521f..796caa65a1 100644
--- a/multimedia/libdriv/libdriv.xml
+++ b/multimedia/libdriv/libdriv.xml
@@ -50,7 +50,7 @@ $Date$
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liba52.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libao.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libass.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcanberra.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcanberra-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdiscid.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdvdcss.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdvdread.xml"/>
diff --git a/postlfs/security/cyrus-sasl-init.xml b/postlfs/security/cyrus-sasl-init.xml
new file mode 100644
index 0000000000..a2ab48ce82
--- /dev/null
+++ b/postlfs/security/cyrus-sasl-init.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
+
+    <sect3 id="cyrus-sasl-init">
+      <title>Init Script</title>
+
+      <para>
+        If you need to run the <command>saslauthd</command> daemon at system
+        startup, install the <filename>/etc/rc.d/init.d/saslauthd</filename>
+        init script included in the <xref linkend="bootscripts"/>
+        package using the following command:
+      </para>
+
+      <indexterm zone="cyrus-sasl cyrus-sasl-init">
+        <primary sortas="f-saslauthd">saslauthd</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-saslauthd</userinput></screen>
+
+      <note>
+        <para>
+          You'll need to modify /etc/sysconfig/saslauthd and replace the
+          <option><replaceable>AUTHMECH</replaceable></option> parameter
+          with your desired authentication mechanism.
+        </para>
+      </note>
+
+    </sect3>
diff --git a/postlfs/security/cyrus-sasl.xml b/postlfs/security/cyrus-sasl.xml
index 10e8564212..452431df1a 100644
--- a/postlfs/security/cyrus-sasl.xml
+++ b/postlfs/security/cyrus-sasl.xml
@@ -281,31 +281,8 @@ install -v -dm700 /var/lib/sasl</userinput></screen>
 
     </sect3>
 
-    <sect3 id="cyrus-sasl-init">
-      <title>Init Script</title>
-
-      <para>
-        If you need to run the <command>saslauthd</command> daemon at system
-        startup, install the <filename>/etc/rc.d/init.d/saslauthd</filename>
-        init script included in the <xref linkend="bootscripts"/>
-        package using the following command:
-      </para>
-
-      <indexterm zone="cyrus-sasl cyrus-sasl-init">
-        <primary sortas="f-saslauthd">saslauthd</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-saslauthd</userinput></screen>
-
-      <note>
-        <para>
-          You'll need to modify /etc/sysconfig/saslauthd and replace the
-          <option><replaceable>AUTHMECH</replaceable></option> parameter
-          with your desired authentication mechanism.
-        </para>
-      </note>
-
-    </sect3>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="cyrus-sasl-init.xml"/>
 
   </sect2>