diff --git a/.gitignore b/.gitignore
index ec90472f..5e981dd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ permission-store-dbus.[ch]
 flatpak-system-helper
 xdg-desktop-portal
 *.service
+flatpak.conf
 flatpak.env
 flatpak.sh
 document-portal/xdp-dbus.[ch]
diff --git a/Makefile.am b/Makefile.am
index 9480bfb3..0814d39c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -133,6 +133,15 @@ flatpak.env: env.d/flatpak.env.in
 	$(AM_V_GEN) $(SED) -e "s|\@localstatedir\@|$(localstatedir)|" \
 		-e "s|\@sysconfdir\@|$(sysconfdir)|" $< > $@
 
+dbussnippetdir = $(systemduserunitdir)/dbus.service.d
+dbussnippet_DATA = flatpak.conf
+EXTRA_DIST += dbus.service.d/flatpak.conf.in
+DISTCLEANFILES += flatpak.conf
+
+flatpak.conf: dbus.service.d/flatpak.conf.in
+	$(AM_V_GEN) $(SED) -e "s|\@localstatedir\@|$(localstatedir)|" \
+		-e "s|\@sysconfdir\@|$(sysconfdir)|" $< > $@
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = flatpak.pc
 EXTRA_DIST += flatpak.pc.in
diff --git a/dbus.service.d/flatpak.conf.in b/dbus.service.d/flatpak.conf.in
new file mode 100644
index 00000000..fdcacd6a
--- /dev/null
+++ b/dbus.service.d/flatpak.conf.in
@@ -0,0 +1,2 @@
+[Service]
+Environment=XDG_DATA_DIRS=%h/.local/share/flatpak/exports/share/:@localstatedir@/lib/flatpak/exports/share/:/usr/local/share/:/usr/share/