diff --git a/ChangeLog b/ChangeLog
index af83d2fa0..0ba91ebb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-31  Christian Persch  <chpe@svn.gnome.org>
+
+	* configure.in:
+	* gnome-settings-daemon/Makefile.am: Don't define dbus services
+	directory in configure. Bug #395383.
+
 2007-01-31  Christian Persch  <chpe@svn.gnome.org>
 
 	* capplets/accessibility/at-properties/Makefile.am:
diff --git a/configure.in b/configure.in
index 1d7754cac..d17177cba 100644
--- a/configure.in
+++ b/configure.in
@@ -378,11 +378,6 @@ AC_SUBST(LIBBONOBO_IDL_DIR)
 BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
 AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
 
-# dbus directory
-DBUS_SERVICES_DIR='$(datadir)'"/dbus-1/services"
-AC_SUBST(DBUS_SERVICES_DIR)
-AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is])
-
 AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
 
 if test x"$GDK_PIXBUF_CSOURCE" = xno; then
diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am
index 047426195..13433ec5e 100644
--- a/gnome-settings-daemon/Makefile.am
+++ b/gnome-settings-daemon/Makefile.am
@@ -113,7 +113,7 @@ gnome-settings-client.h:  gsd-infos.xml
 	dbus-binding-tool --prefix=settings_daemon --mode=glib-client $< > $@
 
 # DBUS stuff
-servicedir = $(DBUS_SERVICES_DIR)
+servicedir = $(datadir)/dbus-1/services
 service_in_files = org.gnome.SettingsDaemon.service.in
 service_DATA = $(service_in_files:.service.in=.service)