diff --git a/configure.ac b/configure.ac
index dbe3bc8ea3..abc283c83d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -727,7 +727,7 @@ AC_ARG_WITH(dbus-sys-dir,
 if test -n "$with_dbus_sys_dir" ; then
 	DBUS_SYS_DIR="$with_dbus_sys_dir"
 else
-	DBUS_SYS_DIR="${sysconfdir}/dbus-1/system.d"
+	DBUS_SYS_DIR="${datadir}/dbus-1/system.d"
 fi
 AC_SUBST(DBUS_SYS_DIR)
 
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 20496c17f7..e75f26001b 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -113,7 +113,7 @@
 
 ###############################################################################
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
 %global dbus_version 1.9.18
 %global dbus_sys_dir %{_datadir}/dbus-1/system.d
 %else
diff --git a/meson.build b/meson.build
index f1c5f082e2..24e50ddef4 100644
--- a/meson.build
+++ b/meson.build
@@ -552,7 +552,7 @@ endif
 dbus_conf_dir = get_option('dbus_conf_dir')
 if dbus_conf_dir == ''
   assert(dbus_dep.found(), 'D-Bus required but not found, please provide a valid system bus config dir')
-  dbus_conf_dir = join_paths(dbus_dep.get_pkgconfig_variable('sysconfdir', define_variable: ['sysconfdir', nm_sysconfdir]), 'dbus-1', 'system.d')
+  dbus_conf_dir = join_paths(dbus_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'system.d')
 endif
 
 dbus_interfaces_dir = dbus_dep.get_pkgconfig_variable('interfaces_dir',  define_variable: ['datadir', nm_datadir])