diff --git a/ChangeLog b/ChangeLog
index d264dfc56c..75dc66571e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-04  Dan Williams  <dcbw@redhat.com>
+
+	* system-settings/src/Makefile.am
+		- Install D-Bus service activation file for the system settings
+			service
+
+	* system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service
+		- D-Bus service activation file for system settings service
+
 2008-02-04  Dan Williams  <dcbw@redhat.com>
 
 	* system-settings/src/main.c
diff --git a/system-settings/src/Makefile.am b/system-settings/src/Makefile.am
index 82ab8cd09e..8417e882d4 100644
--- a/system-settings/src/Makefile.am
+++ b/system-settings/src/Makefile.am
@@ -39,6 +39,11 @@ nm_system_settings_LDFLAGS = -rdynamic
 dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = nm-system-settings.conf
 
-EXTRA_DIST = \
-	$(dbusservice_DATA)
+dbusactivationdir = $(prefix)/share/dbus-1/system-services
+dbusactivation_DATA = org.freedesktop.NetworkManagerSystemSettings.service
+
+EXTRA_DIST = \
+	$(dbusservice_DATA) \
+	$(dbusactivation_DATA)
+
 
diff --git a/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service b/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service
new file mode 100644
index 0000000000..745633c514
--- /dev/null
+++ b/system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service
@@ -0,0 +1,5 @@
+[D-BUS Service]
+Name=org.freedesktop.NetworkManagerSystemSettings
+Exec=/usr/sbin/nm-system-settings --config /etc/nm-system-settings.conf
+User=root
+