diff --git a/configure.ac b/configure.ac
index 170c82c60..eb4cd81fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1586,6 +1586,7 @@ AC_CONFIG_FILES([src/system.pa:src/daemon/system.pa.in],
 AS_IF([test "x$HAVE_SYSTEMD_DAEMON" = "x1"],
     [
         AC_CONFIG_FILES([src/pulseaudio.service:src/daemon/systemd/user/pulseaudio.service.in])
+        AC_CONFIG_FILES([src/pulseaudio-x11.service:src/daemon/systemd/user/pulseaudio-x11.service.in])
     ])
 
 # CMake related ProjectConfig files
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b37f15f7b..7a914f1d7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,6 +7,7 @@ src/daemon/ltdl-bind-now.c
 src/daemon/main.c
 src/daemon/pulseaudio.desktop.in
 src/daemon/systemd/user/pulseaudio.service.in
+src/daemon/systemd/user/pulseaudio-x11.service.in
 src/modules/alsa/alsa-mixer.c
 src/modules/alsa/alsa-sink.c
 src/modules/alsa/alsa-source.c
diff --git a/src/.gitignore b/src/.gitignore
index a12a7f451..1157c9fdc 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -25,6 +25,7 @@ pasuspender
 pax11publish
 pulseaudio
 pulseaudio.service
+pulseaudio-x11.service
 start-pulseaudio-x11
 *-orc-gen.[ch]
 # tests
diff --git a/src/Makefile.am b/src/Makefile.am
index 5d9191f9e..21379da55 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -102,6 +102,7 @@ EXTRA_DIST = \
 		daemon/esdcompat.in \
 		daemon/start-pulseaudio-x11.in \
 		daemon/systemd/user/pulseaudio.service.in \
+		daemon/systemd/user/pulseaudio-x11.service.in \
 		daemon/systemd/user/pulseaudio.socket \
 		utils/padsp.in \
 		utils/qpaeq \
@@ -246,6 +247,7 @@ if HAVE_SYSTEMD_DAEMON
 
 systemduserunit_DATA = \
     pulseaudio.service \
+    pulseaudio-x11.service \
     daemon/systemd/user/pulseaudio.socket
 
 endif
@@ -2212,7 +2214,7 @@ module_allow_passthrough_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_allow_
 ###################################
 
 CLEANFILES += daemon/pulseaudio.desktop
-DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 pulseaudio.service
+DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 pulseaudio.service pulseaudio-x11.service
 
 if OS_IS_WIN32
 SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp