diff --git a/data/Makefile.am b/data/Makefile.am
index 9f249a32..1cf5dfaa 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -39,6 +39,13 @@ service_DATA = $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
 	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
+systemd_userdir = $(prefix)/lib/systemd/user
+systemd_user_in_files = evince.service.in
+systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
+
+$(systemd_user_DATA): $(systemd_user_in_files) Makefile
+	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 endif
 
 #
@@ -85,8 +92,9 @@ EXTRA_DIST =					\
 	$(ui_DATA)				\
 	$(DESKTOP_IN_FILES)			\
 	$(gsettingsschema_in_files)		\
-	org.gnome.evince.Daemon.service.in	\
 	$(man_MANS)				\
+	$(service_in_files)			\
+	$(systemd_user_in_files)		\
 	evince.ico				\
 	evince.convert				\
 	thumbnail-frame.png			\
@@ -99,6 +107,8 @@ EXTRA_DIST =					\
 DISTCLEANFILES = \
 	$(DESKTOP_FILES)	\
 	$(gsettings_SCHEMAS)	\
-	$(service_DATA)
+	$(service_DATA)		\
+	$(systemd_user_DATA)	\
+	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/evince.service.in b/data/evince.service.in
new file mode 100644
index 00000000..3d19bcc8
--- /dev/null
+++ b/data/evince.service.in
@@ -0,0 +1,8 @@
+[Unit]
+Description=Evince document viewer
+Documentation=man:evince(1)
+
+[Service]
+Type=dbus
+BusName=org.gnome.evince.Daemon
+ExecStart=@libexecdir@/evinced
diff --git a/data/org.gnome.evince.Daemon.service.in b/data/org.gnome.evince.Daemon.service.in
index c987f59a..19578f3e 100644
--- a/data/org.gnome.evince.Daemon.service.in
+++ b/data/org.gnome.evince.Daemon.service.in
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=org.gnome.evince.Daemon
 Exec=@libexecdir@/evinced
+SystemdService=evince.service