diff --git a/.gitignore b/.gitignore
index 27aa1dd..39957dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,8 @@
 /dbus-1.11.4.tar.gz
 /dbus-1.11.6.tar.gz
 /dbus-1.11.8.tar.gz
+/dbus-1.11.10.tar.gz
+/dbus-1.11.12.tar.gz
+/dbus-1.11.14.tar.gz
+/dbus-1.11.16.tar.gz
+/dbus-1.11.18.tar.gz
diff --git a/dbus.spec b/dbus.spec
index cfe525a..e1d2785 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -3,12 +3,11 @@
 
 %global gettext_package         dbus-1
 
-%global expat_version           1.95.5
-%global libselinux_version      1.15.2
+%global libselinux_version      2.0.86
 
 %global dbus_user_uid           81
 
-%global dbus_common_config_opts --enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-socket=/run/dbus/system_bus_socket --with-system-pid-file=/run/dbus/messagebus.pid --with-dbus-user=dbus --libexecdir=/%{_libexecdir}/dbus-1 --enable-user-session --docdir=%{_pkgdocdir} --enable-installed-tests
+%global dbus_common_config_opts --enable-libaudit --enable-selinux=yes --with-system-socket=/run/dbus/system_bus_socket --with-dbus-user=dbus --libexecdir=/%{_libexecdir}/dbus-1 --enable-user-session --docdir=%{_pkgdocdir} --enable-installed-tests
 
 # Allow extra dependencies required for some tests to be disabled.
 %bcond_without tests
@@ -17,7 +16,7 @@
 
 Name:    dbus
 Epoch:   1
-Version: 1.11.8
+Version: 1.11.18
 Release: 1%{?dist}
 Summary: D-BUS message bus
 
@@ -32,11 +31,11 @@ Source1: 00-start-message-bus.sh
 
 BuildRequires: autoconf-archive
 BuildRequires: libtool
-BuildRequires: expat-devel >= %{expat_version}
-BuildRequires: libselinux-devel >= %{libselinux_version}
 BuildRequires: audit-libs-devel >= 0.9
 BuildRequires: libX11-devel
 BuildRequires: libcap-ng-devel
+BuildRequires: pkgconfig(expat)
+BuildRequires: pkgconfig(libselinux) >= %{libselinux_version}
 BuildRequires: pkgconfig(libsystemd)
 BuildRequires: pkgconfig(systemd)
 BuildRequires: doxygen
@@ -58,7 +57,7 @@ Requires(pre): /usr/sbin/useradd
 # Note: These is only required for --with-tests; when bootstrapping, you can
 # pass --without-tests.
 %if %{with tests}
-BuildRequires: pkgconfig(gio-2.0)
+BuildRequires: pkgconfig(gio-2.0) >= 2.40.0
 BuildRequires: dbus-python
 BuildRequires: pygobject3
 %endif
@@ -162,7 +161,11 @@ find %{buildroot} -name '*.la' -type f -delete
 
 install -Dp -m755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh
 
-mkdir -p %{buildroot}%{_datadir}/dbus-1/interfaces
+# Obsolete, but still widely used, for drop-in configuration snippets.
+install --directory %{buildroot}%{_sysconfdir}/dbus-1/session.d
+install --directory %{buildroot}%{_sysconfdir}/dbus-1/system.d
+
+install --directory %{buildroot}%{_datadir}/dbus-1/interfaces
 
 # Make sure that when somebody asks for D-Bus under the name of the
 # old SysV script, that he ends up with the standard dbus.service name
@@ -170,16 +173,14 @@ mkdir -p %{buildroot}%{_datadir}/dbus-1/interfaces
 ln -s dbus.service %{buildroot}%{_unitdir}/messagebus.service
 
 ## %find_lang %{gettext_package}
-# Delete the old legacy sysv init script
-rm -rf %{buildroot}%{_initrddir}
 
-mkdir -p %{buildroot}/var/lib/dbus
+install --directory %{buildroot}/var/lib/dbus
 
 install -pm 644 -t %{buildroot}%{_pkgdocdir} \
     doc/introspect.dtd doc/introspect.xsl doc/system-activation.txt
 
 # Make sure that the documentation shows up in Devhelp.
-mkdir -p %{buildroot}%{_datadir}/gtk-doc/html
+install --directory %{buildroot}%{_datadir}/gtk-doc/html
 ln -s %{_pkgdocdir} %{buildroot}%{_datadir}/gtk-doc/html/dbus
 
 # Shell wrapper for installed tests, modified from Debian package.
@@ -276,6 +277,8 @@ popd
 %exclude %{_pkgdocdir}/system-activation.txt
 %exclude %{_pkgdocdir}/*.html
 %dir %{_sysconfdir}/dbus-1
+%dir %{_sysconfdir}/dbus-1/session.d
+%dir %{_sysconfdir}/dbus-1/system.d
 %config %{_sysconfdir}/dbus-1/session.conf
 %config %{_sysconfdir}/dbus-1/system.conf
 %ghost %dir /run/%{name}
@@ -307,6 +310,7 @@ popd
 # behind these permissions
 %attr(4750,root,dbus) %{_libexecdir}/dbus-1/dbus-daemon-launch-helper
 %exclude %{_libexecdir}/dbus-1/dbus-run-installed-tests
+%{_tmpfilesdir}/dbus.conf
 %{_unitdir}/dbus.service
 %{_unitdir}/dbus.socket
 %{_unitdir}/messagebus.service
@@ -315,6 +319,7 @@ popd
 %{_userunitdir}/dbus.service
 %{_userunitdir}/dbus.socket
 %{_userunitdir}/sockets.target.wants/dbus.socket
+%{_sysusersdir}/dbus.conf
 
 %files libs
 %{!?_licensedir:%global license %%doc}
@@ -344,12 +349,31 @@ popd
 %{_datadir}/xml/dbus-1
 %{_libdir}/lib*.so
 %dir %{_libdir}/dbus-1.0
+%{_libdir}/cmake/DBus1
 %{_libdir}/dbus-1.0/include/
 %{_libdir}/pkgconfig/dbus-1.pc
 %{_includedir}/*
 
 
 %changelog
+* Wed Sep 27 2017 David King <amigadave@amigadave.com> - 1:1.11.18-1
+- Update to 1.11.18
+
+* Fri Jul 28 2017 David King <amigadave@amigadave.com> - 1:1.11.16-1
+- Update to 1.11.16
+
+* Thu Jun 29 2017 David King <amigadave@amigadave.com> - 1:1.11.14-1
+- Update to 1.11.14
+
+* Fri Apr 07 2017 David King <amigadave@amigadave.com> - 1:1.11.12-1
+- Update to 1.11.12
+
+* Thu Mar 02 2017 David King <amigadave@amigadave.com> - 1:1.11.10-2
+- Own session.d and system.d directories (#1285033)
+
+* Fri Feb 17 2017 David King <amigadave@amigadave.com> - 1:1.11.10-1
+- Update to 1.11.10
+
 * Tue Nov 29 2016 David King <amigadave@amigadave.com> - 1:1.11.8-1
 - Update to 1.11.8
 
diff --git a/sources b/sources
index 4a03e82..631f68f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4c21f9a536fce4a544761949ec8b456  dbus-1.11.8.tar.gz
+SHA512 (dbus-1.11.18.tar.gz) = daf7738cde405e517e46d8c5ac1d148245e135eb0d2806c8e96de4e59af1949bad3fce8ee928c2e05403566f93f6bb65edaee47ca9576a3f5f5a4d0dcbfeb8ef