diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,10 +1,10 @@
 name       : dbus-broker
 version    : 33
-release    : 3
+release    : 4
 source     :
     - https://github.com/bus1/dbus-broker/releases/download/v33/dbus-broker-33.tar.xz : 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841
 license    : Apache-2.0
-component  : desktop.core
+component  : system.base
 summary    : Linux D-Bus Message Broker
 description: |
     The dbus-broker project is an implementation of a message bus as defined by the D-Bus specification. Its aim is to provide high performance and reliability, while keeping compatibility to the D-Bus reference implementation. It is exclusively written for Linux systems, and makes use of many modern features provided by recent linux kernel releases.
@@ -14,8 +14,7 @@
     - python-docutils
 setup      : |
     %meson_configure -Daudit=true \
-                     -Ddocs=true \
-                     -Dlinux-4-17=true
+                     -Ddocs=true
 build      : |
     %ninja_build
 install    : |
@@ -23,3 +22,9 @@
 check      : |
     unset LD_PRELOAD
     %ninja_check
+
+    # Enable the system service by default
+    ln -s /usr/lib/systemd/system/dbus-broker.service $installdir/usr/lib/systemd/system/dbus.service
+
+    # And the user service
+    ln -s /usr/lib/systemd/user/dbus-broker.service $installdir/usr/lib/systemd/user/dbus.service
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -6,7 +6,7 @@
             <Email>solus@reillybrogan.com</Email>
         </Packager>
         <License>Apache-2.0</License>
-        <PartOf>desktop.core</PartOf>
+        <PartOf>system.base</PartOf>
         <Summary xml:lang="en">Linux D-Bus Message Broker</Summary>
         <Description xml:lang="en">The dbus-broker project is an implementation of a message bus as defined by the D-Bus specification. Its aim is to provide high performance and reliability, while keeping compatibility to the D-Bus reference implementation. It is exclusively written for Linux systems, and makes use of many modern features provided by recent linux kernel releases.
 </Description>
@@ -17,21 +17,23 @@
         <Summary xml:lang="en">Linux D-Bus Message Broker</Summary>
         <Description xml:lang="en">The dbus-broker project is an implementation of a message bus as defined by the D-Bus specification. Its aim is to provide high performance and reliability, while keeping compatibility to the D-Bus reference implementation. It is exclusively written for Linux systems, and makes use of many modern features provided by recent linux kernel releases.
 </Description>
-        <PartOf>desktop.core</PartOf>
+        <PartOf>system.base</PartOf>
         <Files>
             <Path fileType="executable">/usr/bin/dbus-broker</Path>
             <Path fileType="executable">/usr/bin/dbus-broker-launch</Path>
             <Path fileType="library">/usr/lib/systemd/catalog/dbus-broker-launch.catalog</Path>
             <Path fileType="library">/usr/lib/systemd/catalog/dbus-broker.catalog</Path>
             <Path fileType="library">/usr/lib/systemd/system/dbus-broker.service</Path>
+            <Path fileType="library">/usr/lib/systemd/system/dbus.service</Path>
             <Path fileType="library">/usr/lib/systemd/user/dbus-broker.service</Path>
+            <Path fileType="library">/usr/lib/systemd/user/dbus.service</Path>
             <Path fileType="man">/usr/share/man/man1/dbus-broker-launch.1</Path>
             <Path fileType="man">/usr/share/man/man1/dbus-broker.1</Path>
         </Files>
     </Package>
     <History>
-        <Update release="3">
-            <Date>2023-07-23</Date>
+        <Update release="4">
+            <Date>2023-08-02</Date>
             <Version>33</Version>
             <Comment>Packaging update</Comment>
             <Name>Reilly Brogan</Name>