diff --git a/apparmor.d/groups/desktop/dbus-daemon b/apparmor.d/groups/bus/dbus-daemon
similarity index 95%
rename from apparmor.d/groups/desktop/dbus-daemon
rename to apparmor.d/groups/bus/dbus-daemon
index bf6d47a52..eb97a127c 100644
--- a/apparmor.d/groups/desktop/dbus-daemon
+++ b/apparmor.d/groups/bus/dbus-daemon
@@ -18,6 +18,7 @@ profile dbus-daemon @{exec_path} flags=(attach_disconnected) {
   capability sys_resource,
 
   signal (receive) set=(term, kill),
+  signal (receive) set=(term, hup) peer=gdm*,
 
   network netlink raw,
 
@@ -29,6 +30,7 @@ profile dbus-daemon @{exec_path} flags=(attach_disconnected) {
   @{exec_path} mr,
 
   /{usr/,}{lib,libexec}/* rPUx,
+  /{usr/,}lib/ibus/ibus-* rPx,
   /{usr/,}bin/ r,
   /{usr/,}bin/[a-z0-9]* rPUx,
 
diff --git a/apparmor.d/groups/desktop/dbus-run-session b/apparmor.d/groups/bus/dbus-run-session
similarity index 100%
rename from apparmor.d/groups/desktop/dbus-run-session
rename to apparmor.d/groups/bus/dbus-run-session