diff --git a/ChangeLog b/ChangeLog
index dc512d6906..797863ce18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-05-01  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Michael Biebl <biebl@debian.org>
+
+	* callouts/Makefile.am
+	  callouts/org.freedesktop.nm_dispatcher.service.in
+	  system-settings/src/Makefile.am
+	  system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in
+		- use the right install location for dbus-activated stuff
+
 2008-04-30  Dan Williams  <dcbw@redhat.com>
 
 	* src/nm-gsm-device.c
diff --git a/callouts/Makefile.am b/callouts/Makefile.am
index 7a5f70d4eb..330c463c23 100644
--- a/callouts/Makefile.am
+++ b/callouts/Makefile.am
@@ -46,15 +46,25 @@ nm_dispatcher_action_LDADD = \
 nm-dispatcher-glue.h: nm-dispatcher.xml
 	dbus-binding-tool --prefix=nm_dispatcher --mode=glib-server --output=nm-dispatcher-glue.h $(top_srcdir)/callouts/nm-dispatcher.xml
 
-dbusactivationdir = $(prefix)/share/dbus-1/system-services
-dbusactivation_DATA = org.freedesktop.nm_dispatcher.service
+dbusactivationdir = $(datadir)/dbus-1/system-services
+dbusactivation_in_files = org.freedesktop.nm_dispatcher.service.in
+dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)
+
+%.service: %.service.in
+	$(edit) $< >$@
+
+edit = @sed \
+	-e 's|@sbindir[@]|$(sbindir)|g' \
+	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+	-e 's|@localstatedir[@]|$(localstatedir)|g' \
+	-e 's|@libexecdir[@]|$(libexecdir)|g'
 
 BUILT_SOURCES = nm-dispatcher-glue.h
 
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES) $(dbusactivation_DATA)
 
 EXTRA_DIST = \
 	$(dbusservice_DATA) \
-	$(dbusactivation_DATA) \
+	$(dbusactivation_in_files) \
 	nm-dispatcher.xml
 
diff --git a/callouts/org.freedesktop.nm_dispatcher.service b/callouts/org.freedesktop.nm_dispatcher.service.in
similarity index 61%
rename from callouts/org.freedesktop.nm_dispatcher.service
rename to callouts/org.freedesktop.nm_dispatcher.service.in
index 57c57e2ad7..b8f5bd1a80 100644
--- a/callouts/org.freedesktop.nm_dispatcher.service
+++ b/callouts/org.freedesktop.nm_dispatcher.service.in
@@ -1,5 +1,5 @@
 [D-BUS Service]
 Name=org.freedesktop.nm_dispatcher
-Exec=/usr/libexec/nm-dispatcher.action
+Exec=@libexecdir@/nm-dispatcher.action
 User=root
 
diff --git a/system-settings/src/Makefile.am b/system-settings/src/Makefile.am
index b143e3bebd..c80a54ae2a 100644
--- a/system-settings/src/Makefile.am
+++ b/system-settings/src/Makefile.am
@@ -51,13 +51,24 @@ nm-settings-system-glue.h: $(top_srcdir)/introspection/nm-settings-system.xml
 dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = nm-system-settings.conf
 
-dbusactivationdir = $(prefix)/share/dbus-1/system-services
-dbusactivation_DATA = org.freedesktop.NetworkManagerSystemSettings.service
+dbusactivationdir = $(datadir)/dbus-1/system-services
+dbusactivation_in_files = org.freedesktop.NetworkManagerSystemSettings.service.in
+dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)
+
+%service: %service.in
+	$(edit) $< >$@
+
+edit = @sed \
+	-e 's|@sbindir[@]|$(sbindir)|g' \
+	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+	-e 's|@localstatedir[@]|$(localstatedir)|g' \
+	-e 's|@libexecdir[@]|$(libexecdir)|g'
 
 EXTRA_DIST = \
 	$(dbusservice_DATA) \
-	$(dbusactivation_DATA)
+	$(dbusactivation_in_files)
 
 CLEANFILES = \
-	$(BUILT_SOURCES)
+	$(BUILT_SOURCES) \
+	$(dbusactivation_DATA)
 
diff --git a/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service b/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in
similarity index 57%
rename from system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service
rename to system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in
index 745633c514..1e3ed03a56 100644
--- a/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service
+++ b/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service.in
@@ -1,5 +1,5 @@
 [D-BUS Service]
 Name=org.freedesktop.NetworkManagerSystemSettings
-Exec=/usr/sbin/nm-system-settings --config /etc/nm-system-settings.conf
+Exec=@sbindir@/nm-system-settings --config /etc/nm-system-settings.conf
 User=root