diff --git a/dbus-daemon.service b/dbus-daemon.service
new file mode 100644
index 0000000..7a1df87
--- /dev/null
+++ b/dbus-daemon.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=D-Bus System Message Bus
+Documentation=man:dbus-daemon(1)
+Requires=dbus.socket
+
+[Service]
+ExecStart=/usr/bin/dbus-daemon --system --address=systemd: --nofork --nopidfile --systemd-activation --syslog-only
+ExecReload=/usr/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
+OOMScoreAdjust=-900
diff --git a/dbus-daemon.user.service b/dbus-daemon.user.service
new file mode 100644
index 0000000..ce7cabf
--- /dev/null
+++ b/dbus-daemon.user.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=D-Bus User Message Bus
+Documentation=man:dbus-daemon(1)
+Requires=dbus.socket
+
+[Service]
+ExecStart=/usr/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation --syslog-only
+ExecReload=/usr/bin/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
diff --git a/dbus.socket b/dbus.socket
new file mode 100644
index 0000000..5c373cf
--- /dev/null
+++ b/dbus.socket
@@ -0,0 +1,5 @@
+[Unit]
+Description=D-Bus System Message Bus Socket
+
+[Socket]
+ListenStream=/run/dbus/system_bus_socket
diff --git a/dbus.spec b/dbus.spec
index fe1f00c..4b2e139 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -30,6 +30,10 @@ URL:     http://www.freedesktop.org/Software/dbus/
 #VCS:    git:git://git.freedesktop.org/git/dbus/dbus
 Source0: https://dbus.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 Source1: 00-start-message-bus.sh
+Source2: dbus.socket
+Source3: dbus-daemon.service
+Source4: dbus.user.socket
+Source5: dbus-daemon.user.service
 Patch0: 0001-tools-Use-Python3-for-GetAllMatchRules.patch
 
 BuildRequires: autoconf-archive
@@ -202,19 +206,40 @@ find %{buildroot} -name '*.la' -type f -delete
 rm -rf %{buildroot}%{_libdir}/cmake
 %endif
 
+# Delete upstream units
+rm -f %{buildroot}%{_unitdir}/dbus.{socket,service}
+rm -f %{buildroot}%{_unitdir}/sockets.target.wants/dbus.socket
+rm -f %{buildroot}%{_unitdir}/multi-user.target.wants/dbus.service
+rm -f %{buildroot}%{_userunitdir}/dbus.{socket,service}
+rm -f %{buildroot}%{_userunitdir}/sockets.target.wants/dbus.socket
+
+# Install downstream units
 install -Dp -m755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh
+install -Dp -m644 %{SOURCE2} %{buildroot}%{_unitdir}/dbus.socket
+install -Dp -m644 %{SOURCE3} %{buildroot}%{_unitdir}/dbus-daemon.service
+install -Dp -m644 %{SOURCE4} %{buildroot}%{_userunitdir}/dbus.socket
+install -Dp -m644 %{SOURCE5} %{buildroot}%{_userunitdir}/dbus-daemon.service
 
-# 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
+# dbus-daemon is the default D-Bus implementation on Fedora
+ln -f -s dbus-daemon.service %{buildroot}%{_unitdir}/dbus.service
+ln -f -s dbus-daemon.service %{buildroot}%{_userunitdir}/dbus.service
 
-install --directory %{buildroot}%{_datadir}/dbus-1/interfaces
+# D-Bus is unconditionally enabled on all systems
+ln -f -s ../dbus.service %{buildroot}%{_unitdir}/multi-user.target.wants/dbus.service
+ln -f -s ../dbus.socket %{buildroot}%{_unitdir}/sockets.target.wants/dbus.socket
+ln -f -s ../dbus.socket %{buildroot}%{_userunitdir}/sockets.target.wants/dbus.socket
 
 # 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
 # now.
 ln -s dbus.service %{buildroot}%{_unitdir}/messagebus.service
 
+# 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
+
 ## %find_lang %{gettext_package}
 
 install --directory %{buildroot}/var/lib/dbus
@@ -291,18 +316,18 @@ popd
     -s /sbin/nologin -r -d '/' dbus 2> /dev/null || :
 
 %post daemon
-%systemd_post dbus.service dbus.socket
-%systemd_user_post dbus.service dbus.socket
+%systemd_post dbus-daemon.service dbus.socket
+%systemd_user_post dbus-daemon.service dbus.socket
 
 %post libs -p /sbin/ldconfig
 
 %preun daemon
-%systemd_preun dbus.service dbus.socket
-%systemd_user_preun dbus.service dbus.socket
+%systemd_preun dbus-daemon.service dbus.socket
+%systemd_user_preun dbus-daemon.service dbus.socket
 
 %postun daemon
-%systemd_postun dbus.service dbus.socket
-%systemd_user_postun dbus.service dbus.socket
+%systemd_postun dbus-daemon.service dbus.socket
+%systemd_user_postun dbus-daemon.service dbus.socket
 
 %postun libs -p /sbin/ldconfig
 
@@ -357,11 +382,13 @@ popd
 %attr(4750,root,dbus) %{_libexecdir}/dbus-1/dbus-daemon-launch-helper
 %exclude %{_libexecdir}/dbus-1/dbus-run-installed-tests
 %{_tmpfilesdir}/dbus.conf
+%{_unitdir}/dbus-daemon.service
 %{_unitdir}/dbus.service
 %{_unitdir}/dbus.socket
 %{_unitdir}/messagebus.service
 %{_unitdir}/multi-user.target.wants/dbus.service
 %{_unitdir}/sockets.target.wants/dbus.socket
+%{_userunitdir}/dbus-daemon.service
 %{_userunitdir}/dbus.service
 %{_userunitdir}/dbus.socket
 %{_userunitdir}/sockets.target.wants/dbus.socket
@@ -415,6 +442,10 @@ popd
 
 
 %changelog
+* Fri Aug 10 2018 David Herrmann <dh.herrmann@gmail.com> - 1:1.12.10-1
+- Provide custom systemd unit files to replace the upstream units. Also rename
+  the service to 'dbus-daemon.service', but provide an alias to 'dbus.service'.
+
 * Fri Aug 03 2018 David King <amigadave@amigadave.com> - 1:1.12.10-1
 - Update to 1.12.10
 
diff --git a/dbus.user.socket b/dbus.user.socket
new file mode 100644
index 0000000..dc5ed89
--- /dev/null
+++ b/dbus.user.socket
@@ -0,0 +1,6 @@
+[Unit]
+Description=D-Bus User Message Bus Socket
+
+[Socket]
+ListenStream=%t/bus
+ExecStartPost=-/usr/bin/systemctl --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus