diff --git a/90-default-user.preset b/90-default-user.preset
index be07967..cb8efe1 100644
--- a/90-default-user.preset
+++ b/90-default-user.preset
@@ -3,7 +3,7 @@
 # https://src.fedoraproject.org/rpms/fedora-release/pull-request/4
 # https://fedoraproject.org/w/index.php?title=Starting_services_by_default&oldid=377748
 enable dbus.socket
-enable dbus-daemon.service
+enable dbus-broker.service
 
 # This enables the pipewire service to be socket-activated for
 # individual user sessions.
diff --git a/90-default.preset b/90-default.preset
index 6e4068d..7effdd2 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -13,7 +13,7 @@ disable systemd-resolved.service
 # System stuff
 # https://fedoraproject.org/w/index.php?title=Starting_services_by_default&oldid=377748
 enable dbus.socket
-enable dbus-daemon.service
+enable dbus-broker.service
 enable sshd.service
 
 # Locally-running services
diff --git a/fedora-release.spec b/fedora-release.spec
index dcb46ce..20e24cf 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -14,7 +14,7 @@
 Summary:        Fedora release files
 Name:           fedora-release
 Version:        30
-Release:        0.21
+Release:        0.22
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -636,6 +636,10 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
 
 
 %changelog
+* Fri Feb 08 2019 David Rheinsberg <david.rheinsberg@gmail.com> - 30-0.22
+- Enable dbus-broker over dbus-daemon, to make new installs use the broker as
+  new system- and user-bus implementation.
+
 * Sun Feb 03 2019 Neal Gompa <ngompa13@gmail.com> - 30-0.21
 - Add snappy variant