diff --git a/services/datastore/.gitignore b/services/datastore/.gitignore
new file mode 100644
index 00000000..c0ede5ed
--- /dev/null
+++ b/services/datastore/.gitignore
@@ -0,0 +1 @@
+org.laptop.sugar.DataStore.service
diff --git a/services/datastore/Makefile.am b/services/datastore/Makefile.am
index ff8a4e5a..29b044c9 100644
--- a/services/datastore/Makefile.am
+++ b/services/datastore/Makefile.am
@@ -1,3 +1,10 @@
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.laptop.sugar.DataStore.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+$(service_DATA): $(service_in_files) Makefile
+	@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
+
 sugardir = $(pkgdatadir)/services/data-store
 sugar_PYTHON =      \
 	__init__.py     \
@@ -6,4 +13,4 @@ sugar_PYTHON =      \
 
 bin_SCRIPTS = sugar-data-store
 
-EXTRA_DIST = $(bin_SCRIPTS)
+EXTRA_DIST = $(bin_SCRIPTS) org.laptop.sugar.DataStore.service.in
diff --git a/services/datastore/org.laptop.sugar.DataStore.service.in b/services/datastore/org.laptop.sugar.DataStore.service.in
new file mode 100644
index 00000000..9523788f
--- /dev/null
+++ b/services/datastore/org.laptop.sugar.DataStore.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name = org.laptop.sugar.DataStore
+Exec = @bindir@/sugar-data-store
+