Index: server/mail/dovecot.xml
===================================================================
--- server/mail/dovecot.xml	(revision cacdba3a4729d901ea8e11826ea3b4c32b02914c)
+++ server/mail/dovecot.xml	(revision d555a31f7c235cc8fa1e58d351518496d59f170d)
@@ -120,4 +120,5 @@
             --localstatedir=/var \
             --docdir=/usr/share/doc/dovecot-&dovecot-version; \
+            --with-systemdsystemunitdir=/lib/systemd/system \
             --disable-static &amp;&amp;
 make</userinput></screen>
@@ -147,4 +148,10 @@
       <option>--with-pgsql</option>: This switch enables
       <application>PostgreSQL</application> authentication support.
+    </para>
+
+    <para>
+      <option>--with-systemdsystemunitdir=/lib/systemd/system</option>: This switch enables
+      enables systemd support and specifies the correct location for the
+      systemd unit file.
     </para>
 
@@ -237,13 +244,13 @@
     </sect3>
 
-    <sect3 id="dovecot-init">
-      <title>Boot Script</title>
-
-      <para>If you want the <application>Dovecot</application> server to
-      start automatically when the system is booted, install the
-      <filename>/etc/rc.d/init.d/dovecot</filename> init script included
-      in the <xref linkend="bootscripts"/> package.</para>
-
-      <indexterm zone="dovecot dovecot-init">
+    <sect3 id="dovecot-init-systemd">
+      <title>Systemd Unit File</title>
+
+      <para>This package provides a systemd unit file in the source tarball.
+       To enable the systemd unit file run the following
+       command as the <systemitem class="username">root</systemitem>user:
+      </para>
+
+      <indexterm zone="dovecot dovecot-init-systemd">
         <primary sortas="f-dovecot">dovecot</primary>
       </indexterm>
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision cacdba3a4729d901ea8e11826ea3b4c32b02914c)
+++ server/mail/exim.xml	(revision d555a31f7c235cc8fa1e58d351518496d59f170d)
@@ -280,23 +280,18 @@
     </sect3>
 
-    <sect3  id="exim-init">
-      <title>Boot Script</title>
-
-      <para>To automate the running of <command>exim</command> at startup,
-      install the <filename>/etc/rc.d/init.d/exim</filename> init script
-      included in the <xref linkend="bootscripts"/>
-      package.</para>
-
-      <indexterm zone="exim exim-init">
+    <sect3  id="exim-init-systemd">
+      <title>Systemd Unit File</title>
+
+      <para>The systemd-units package provides a native systemd unit file.
+       To install and enable the systemd unit file included
+       in the <xref linkend="systemd-units"/> package, run the following
+       command as the <systemitem class="username">root</systemitem>user:
+      </para>
+
+      <indexterm zone="exim exim-init-systemd">
         <primary sortas="f-exim">exim</primary>
       </indexterm>
 
 <screen role="root"><userinput>make install-exim</userinput></screen>
-
-      <para>The bootscript also starts the <application>Exim</application>
-      daemon and dispatches a queue runner process every 15 minutes. Modify
-      the <option>-q<replaceable>&lt;time interval&gt;</replaceable></option>
-      parameter in <filename>/etc/rc.d/init.d/exim</filename>, if necessary
-      for your installation.</para>
 
     </sect3>
Index: server/mail/postfix.xml
===================================================================
--- server/mail/postfix.xml	(revision cacdba3a4729d901ea8e11826ea3b4c32b02914c)
+++ server/mail/postfix.xml	(revision d555a31f7c235cc8fa1e58d351518496d59f170d)
@@ -405,14 +405,14 @@
     </sect3>
 
-    <sect3 id="postfix-init">
-      <title>Boot Script</title>
-
-      <para>
-        To automate the running of Postfix at startup, install the
-        <filename>/etc/rc.d/init.d/postfix</filename> init script included in
-        the <xref linkend="bootscripts"/> package.
-      </para>
-
-      <indexterm zone="postfix postfix-init">
+    <sect3 id="postfix-init-systemd">
+      <title>Systemd Unit File</title>
+
+      <para>The systemd-units package provides a native systemd unit file.
+       To install and enable the systemd unit file included
+       in the <xref linkend="systemd-units"/> package, run the following
+       command as the <systemitem class="username">root</systemitem>user:
+      </para>
+
+      <indexterm zone="postfix postfix-init-systemd">
         <primary sortas="f-postfix">postfix</primary>
       </indexterm>
