diff --git a/Makefile.am b/Makefile.am
index b8a709c07..8cf8ec5ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1250,6 +1250,7 @@ FILTER_LIBS = \
 
 if HAVE_SYSTEMD
 systemdsystemunit_DATA = \
+	systemd/mpd.socket \
 	systemd/mpd.service
 endif
 
diff --git a/NEWS b/NEWS
index c1def0786..d88d6da08 100644
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,7 @@ ver 0.19 (not yet released)
   - name each thread (for debugging)
 * new resampler option using libsoxr
 * allow playlist directory without music directory
+* install systemd unit for socket activation
 
 ver 0.18.8 (2014/02/07)
 * decoder
diff --git a/doc/user.xml b/doc/user.xml
index dc9d913e7..ba35bfa5b 100644
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -135,29 +135,18 @@ apt-get install g++ automake autoconf \
       <para>
         Using <filename>systemd</filename>, you can launch
         <filename>mpd</filename> on demand when the first client
-        attempts to connect.  Create two files in
-        <filename>/etc/systemd/system/</filename>; first
-        <filename>mpd.socket</filename>:
+        attempts to connect.
       </para>
 
-      <programlisting>[Socket]
-ListenStream=/run/mpd.socket
-ListenStream=6600
-[Install]
-WantedBy=sockets.target</programlisting>
-
       <para>
-        Now create <filename>mpd.service</filename>:
+        MPD comes with two <filename>systemd</filename> unit files: a
+        "service" unit and a "socket" unit.  These will only be
+        installed when MPD was configured with
+        <parameter>--with-systemdsystemunitdir=/lib/systemd</parameter>.
       </para>
 
-      <programlisting>[Unit]
-Description=Music Player Daemon
-After=sound.target
-[Service]
-ExecStart=/usr/bin/mpd --stdout --no-daemon</programlisting>
-
       <para>
-        Start the socket:
+        To enable socket activation, type:
       </para>
 
       <programlisting>systemctl enable mpd.socket
diff --git a/systemd/mpd.socket b/systemd/mpd.socket
new file mode 100644
index 000000000..c4692592c
--- /dev/null
+++ b/systemd/mpd.socket
@@ -0,0 +1,9 @@
+[Socket]
+ListenStream=/run/mpd/socket
+ListenStream=6600
+Backlog=5
+KeepAlive=true
+PassCredentials=true
+
+[Install]
+WantedBy=sockets.target