diff --git a/Makefile.am b/Makefile.am
index 3dad313347..5c7405373d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2645,6 +2645,14 @@ localed-install-data-hook:
 INSTALL_DATA_HOOKS += \
 	localed-install-data-hook
 
+MANPAGES += \
+	man/systemd-localed.service.8
+
+MANPAGES_ALIAS += \
+	man/systemd-localed.8
+
+man/systemd-localed.8: man/systemd-localed.service.8
+
 EXTRA_DIST += \
 	units/systemd-localed.service.in
 
diff --git a/man/systemd-localed.service.xml b/man/systemd-localed.service.xml
new file mode 100644
index 0000000000..bdc2a08130
--- /dev/null
+++ b/man/systemd-localed.service.xml
@@ -0,0 +1,83 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+  This file is part of systemd.
+
+  Copyright 2012 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="systemd-localed.service">
+
+        <refentryinfo>
+                <title>systemd-localed</title>
+                <productname>systemd</productname>
+
+                <authorgroup>
+                        <author>
+                                <contrib>Developer</contrib>
+                                <firstname>Lennart</firstname>
+                                <surname>Poettering</surname>
+                                <email>lennart@poettering.net</email>
+                        </author>
+                </authorgroup>
+        </refentryinfo>
+
+        <refmeta>
+                <refentrytitle>systemd-localed</refentrytitle>
+                <manvolnum>8</manvolnum>
+        </refmeta>
+
+        <refnamediv>
+                <refname>systemd-localed.service</refname>
+                <refname>systemd-localed</refname>
+                <refpurpose>systemd Time and Date Bus Mechanism</refpurpose>
+        </refnamediv>
+
+        <refsynopsisdiv>
+                <para><filename>systemd-localed.service</filename></para>
+                <para><filename>/usr/lib/systemd/systemd-localed</filename></para>
+        </refsynopsisdiv>
+
+        <refsect1>
+                <title>Description</title>
+
+                <para><filename>systemd-localed</filename> is a system
+                service that may be used as mechanism to change the
+                system locale settings, as well as the console key
+                mapping and default X11 key
+                mapping. <filename>systemd-timedated</filename> is
+                automatically activated on request and terminates
+                itself when it is unused.</para>
+
+                <para>See the <ulink
+                url="http://www.freedesktop.org/wiki/Software/systemd/localed">
+                developer documentation</ulink> for information about
+                the APIs <filename>systemd-localed</filename>
+                provides.</para>
+        </refsect1>
+
+        <refsect1>
+                <title>See Also</title>
+                <para>
+                        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>vconsole.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                </para>
+        </refsect1>
+
+</refentry>
diff --git a/man/systemd-timedated.service.xml b/man/systemd-timedated.service.xml
index 354fcd6b88..1cf6a077d4 100644
--- a/man/systemd-timedated.service.xml
+++ b/man/systemd-timedated.service.xml
@@ -58,11 +58,11 @@
 
                 <para><filename>systemd-timedated</filename> is a
                 system service that may be used as mechanism to change
-                the system clock and timezone, as well as
+                the system clock and timezone, as well as to
                 enable/disable NTP time
                 synchronization. <filename>systemd-timedated</filename>
-                is only activated on requests and terminates itself
-                when it is unused.</para>
+                is automatically activated on request and terminates
+                itself when it is unused.</para>
 
                 <para>See the <ulink
                 url="http://www.freedesktop.org/wiki/Software/systemd/timedated">
diff --git a/units/systemd-localed.service.in b/units/systemd-localed.service.in
index f973fa4585..6818a4c5c6 100644
--- a/units/systemd-localed.service.in
+++ b/units/systemd-localed.service.in
@@ -7,9 +7,8 @@
 
 [Unit]
 Description=Locale Service
+Documentation=man:systemd-localed.service(8) man:locale.conf(5) man:vconsole.conf(5)
 Documentation=http://www.freedesktop.org/wiki/Software/systemd/localed
-Documentation=man:locale.conf(5)
-Documentation=man:vconsole.conf(5)
 
 [Service]
 ExecStart=@rootlibexecdir@/systemd-localed