diff --git a/SOURCES/dbus-kill-process-with-session b/SOURCES/dbus-kill-process-with-session
index f999a4d..c60199f 100644
--- a/SOURCES/dbus-kill-process-with-session
+++ b/SOURCES/dbus-kill-process-with-session
@@ -6,7 +6,7 @@
 
 exec >& /dev/null
 
-trap "kill -TERM $1" EXIT
+trap 'kill -TERM $1 $(jobs -p)' EXIT
 
 export GVFS_DISABLE_FUSE=1
 coproc SESSION_MONITOR (gio monitor -f "/run/systemd/sessions/${XDG_SESSION_ID}")
diff --git a/SPECS/dbus.spec b/SPECS/dbus.spec
index cf7a5c6..4c45f53 100644
--- a/SPECS/dbus.spec
+++ b/SPECS/dbus.spec
@@ -19,7 +19,7 @@
 Name:    dbus
 Epoch:   1
 Version: 1.12.8
-Release: 18%{?dist}
+Release: 18%{?dist}.1
 Summary: D-BUS message bus
 
 Group:   System Environment/Libraries
@@ -411,6 +411,11 @@ popd
 %{_includedir}/*
 
 %changelog
+* Thu Jun 16 2022 Ray Strode <rstrode@redhat.com> - 1:1.12.8-18.1
+- Ensure SSH session monitoring script is cleaned up when the
+  session exits.
+  Resolves: #2097784
+
 * Mon Dec 06 2021 Ray Strode <rstrode@redhat.com> - 1.12.8-18
 - Ensure session bus started for SSH sessions gets used by those
   sessions.