diff --git a/vpn-daemons/vpnc/ChangeLog b/vpn-daemons/vpnc/ChangeLog
index d8348b68b3..f34be06a88 100644
--- a/vpn-daemons/vpnc/ChangeLog
+++ b/vpn-daemons/vpnc/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-16  David Zeuthen  <davidz@redhat.com>
+
+	* Makefile.am (dbusservicedir): Adjust to use $(sysconfdir)
+
+	* configure.in: Don't do the DBUS_SYS_DIR thing since it's always
+	at $(sysconfdir)/dbus-1/system.d
+
 2005-06-16  David Zeuthen  <davidz@redhat.com>
 
 	* properties/nm-vpnc.c: Include w_use_domain and w_domain
diff --git a/vpn-daemons/vpnc/Makefile.am b/vpn-daemons/vpnc/Makefile.am
index 9f9ddfab96..4bd34e5e41 100644
--- a/vpn-daemons/vpnc/Makefile.am
+++ b/vpn-daemons/vpnc/Makefile.am
@@ -1,11 +1,11 @@
 SUBDIRS = src auth-dialog properties po
 
-dbusservicedir = $(DBUS_SYS_DIR)
+dbusservicedir = $(sysconfdir)/dbus-1/system.d
 dbusservice_DATA = nm-vpnc-service.conf
 
 nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
 nmvpnservice_DATA = nm-vpnc-service.name
 
-EXTRA_DIST = $(dbusservice_DATA) $(nmvpnservice_DATA)
+EXTRA_DIST = $(nmvpnservice_DATA) $(dbusservice_DATA) 
 
 CLEANFILES = *~
diff --git a/vpn-daemons/vpnc/configure.in b/vpn-daemons/vpnc/configure.in
index 9842d66f14..1f85095e3c 100644
--- a/vpn-daemons/vpnc/configure.in
+++ b/vpn-daemons/vpnc/configure.in
@@ -76,16 +76,6 @@ PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
 AC_SUBST(GNOMEKEYRING_CFLAGS)
 AC_SUBST(GNOMEKEYRING_LIBS)
 
-AC_ARG_WITH(dbus-sys, AC_HELP_STRING([--with-dbus-sys=DIR], [where D-BUS system.d directory is]))
-
-if ! test -z "$with_dbus_sys" ; then
-    DBUS_SYS_DIR="$with_dbus_sys"
-else
-    DBUS_SYS_DIR="${sysconfdir}/dbus-1/system.d"
-fi
-AC_SUBST(DBUS_SYS_DIR)
-AC_DEFINE_UNQUOTED(DBUS_SYSTEMD_DIR, "$DBUS_SYS_DIR", [Where system.d dir for DBUS is])
-
 AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
 AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
 AS_AC_EXPAND(DATADIR, $datadir)
diff --git a/vpn-daemons/vpnc/po/da.po b/vpn-daemons/vpnc/po/da.po
index 44196f9417..8d9370782e 100644
--- a/vpn-daemons/vpnc/po/da.po
+++ b/vpn-daemons/vpnc/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager-vpnc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-16 14:01-0400\n"
+"POT-Creation-Date: 2005-06-16 14:40-0400\n"
 "PO-Revision-Date: 2005-06-11 23:21-0400\n"
 "Last-Translator: David Zeuthen <davidz@redhat.com>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"