diff --git a/Makefile.am b/Makefile.am
index f1f9da7a0b..a96b89d618 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,6 +87,7 @@ dist_systemunit_DATA = \
 	units/local-fs.target \
 	units/network.target \
 	units/nss-lookup.target \
+	units/mail-transfer-agent.target \
 	units/poweroff.target \
 	units/reboot.target \
 	units/remote-fs.target \
diff --git a/man/systemd.special.xml.in b/man/systemd.special.xml.in
index 1c647e903c..0af9c6e7bb 100644
--- a/man/systemd.special.xml.in
+++ b/man/systemd.special.xml.in
@@ -57,6 +57,7 @@
                 <filename>halt.target</filename>,
                 <filename>kbrequest.target</filename>,
                 <filename>local-fs.target</filename>,
+                <filename>mail-transfer-agent.target</filename>,
                 <filename>multi-user.target</filename>,
                 <filename>network.target</filename>,
                 <filename>nss-lookup.target</filename>,
@@ -248,6 +249,29 @@
                                         facility.</para>
                                 </listitem>
                         </varlistentry>
+                        <varlistentry>
+                                <term><filename>mail-transfer-agent.target</filename></term>
+                                <listitem>
+                                        <para>The mail transfer agent
+                                        (MTA) service. Usually this
+                                        should pull in all units
+                                        necessary for
+                                        sending/receiving mails on the
+                                        local host.</para>
+
+                                        <para>systemd automatically
+                                        adds dependencies of type
+                                        After for this target unit to
+                                        all SysV init script service
+                                        units with an LSB header
+                                        referring to the
+                                        <literal>$mail-transfer-argent</literal>
+                                        or
+                                        <literal>$mail-transport-agent</literal>
+                                        facilities, for compatibility
+                                        with Debian.</para>
+                                </listitem>
+                        </varlistentry>
                         <varlistentry>
                                 <term><filename>multi-user.target</filename></term>
                                 <listitem>
diff --git a/units/mail-transfer-agent.target b/units/mail-transfer-agent.target
new file mode 100644
index 0000000000..2640076d68
--- /dev/null
+++ b/units/mail-transfer-agent.target
@@ -0,0 +1,11 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+# See systemd.special(7) for details
+
+[Unit]
+Description=Mail Transfer Agent