diff --git a/Makefile.am b/Makefile.am
index 34a4a3d..18e45a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
 AUTOMAKE_OPTIONS = dist-bzip2
-SUBDIRS = src tests
+SUBDIRS = src data tests
 EXTRA_DIST = TODO
 
diff --git a/configure.ac b/configure.ac
index d25df8c..e038f33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,6 @@ CFLAGS="$saved_cflags"
 AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
 AC_SUBST(AM_CFLAGS)
 
-AC_CONFIG_FILES([Makefile] [src/Makefile] [tests/Makefile])
+AC_CONFIG_FILES([Makefile] [src/Makefile] [data/Makefile] [tests/Makefile])
 AC_OUTPUT
 
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..0243423
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,15 @@
+
+dbus_servicesdir = $(datadir)/dbus-1/system-services
+dbus_confdir = $(sysconfdir)/dbus-1/system.d
+
+dbus_services_in_files = net.reactivated.Fprint.service.in
+
+dbus_services_DATA = $(dbus_services_in_files:.service.in=.service)
+
+$(dbus_services_DATA): $(dbus_services_in_files)
+	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+
+dbus_conf_DATA = net.reactivated.Fprint.conf
+
+
+
diff --git a/data/net.reactivated.Fprint.conf b/data/net.reactivated.Fprint.conf
new file mode 100644
index 0000000..dabefa0
--- /dev/null
+++ b/data/net.reactivated.Fprint.conf
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
+
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <!-- Only root can own the service -->
+  <policy user="root">
+    <allow own="net.reactivated.Fprint"/>
+  </policy>
+
+</busconfig>
diff --git a/data/net.reactivated.Fprint.service.in b/data/net.reactivated.Fprint.service.in
new file mode 100644
index 0000000..a191a0a
--- /dev/null
+++ b/data/net.reactivated.Fprint.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=net.reactivated.Fprint
+Exec=@LIBEXECDIR@/fprintd
+User=root
diff --git a/src/Makefile.am b/src/Makefile.am
index 6775178..77e4fee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ noinst_HEADERS = $(BUILT_SOURCES)
 CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST = fprintd.xml
 
-bin_PROGRAMS = fprintd
+libexec_PROGRAMS = fprintd
 
 fprintd_SOURCES = main.c manager.c device.c file_storage.c
 fprintd_LDADD = $(GLIB_LIBS) $(DBUS_GLIB_LIBS) $(FPRINT_LIBS)