diff --git a/10-timeout-abort.conf b/10-timeout-abort.conf
deleted file mode 100644
index 4852648..0000000
--- a/10-timeout-abort.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is part of the systemd package.
-# See https://fedoraproject.org/wiki/Changes/Shorter_Shutdown_Timer.
-#
-# To facilitate debugging when a service fails to stop cleanly,
-# TimeoutStopFailureMode=abort is set to "crash" services that fail to stop in
-# the time allotted. This will cause the service to be terminated with SIGABRT
-# and a coredump to be generated.
-#
-# To undo this configuration change, create a mask file:
-#   sudo mkdir -p /etc/systemd/system/service.d
-#   sudo ln -sv /dev/null /etc/systemd/system/service.d/10-timeout-abort.conf
-
-[Service]
-TimeoutStopFailureMode=abort
diff --git a/systemd.spec b/systemd.spec
index e1ebc90..7d5c51e 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -48,7 +48,7 @@ Url:            https://systemd.io
 # Allow users to specify the version and release when building the rpm by 
 # setting the %%version_override and %%release_override macros.
 Version:        %{?version_override}%{!?version_override:256}
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 %global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?)
 
@@ -83,7 +83,7 @@ Source13:       .abignore
 
 Source14:       10-oomd-defaults.conf
 Source15:       10-oomd-per-slice-defaults.conf
-Source16:       10-timeout-abort.conf
+
 Source17:       10-map-count.conf
 
 Source21:       macros.sysusers
@@ -739,6 +739,7 @@ CONFIGURE_OPTS=(
         -Dsbat-distro-url=mailto:secalert@redhat.com
         -Dsshconfdir=no
         -Dsshdconfdir=no
+        -Duserdb=false
 )
 
 %if %{without lto}
@@ -756,8 +757,6 @@ if ! diff -u %{SOURCE1} ${new_triggers}; then
    sleep 5
 fi
 
-sed -r 's|/system/|/user/|g' %{SOURCE16} >10-timeout-abort.conf.user
-
 %install
 %meson_install
 
@@ -859,9 +858,6 @@ install -Dm0644 -t %{buildroot}%{_prefix}/lib/systemd/ %{SOURCE13}
 install -Dm0644 -t %{buildroot}%{_prefix}/lib/systemd/oomd.conf.d/ %{SOURCE14}
 install -Dm0644 -t %{buildroot}%{system_unit_dir}/system.slice.d/ %{SOURCE15}
 install -Dm0644 -t %{buildroot}%{user_unit_dir}/slice.d/ %{SOURCE15}
-# https://fedoraproject.org/wiki/Changes/Shorter_Shutdown_Timer
-install -Dm0644 -t %{buildroot}%{system_unit_dir}/service.d/ %{SOURCE16}
-install -Dm0644 10-timeout-abort.conf.user %{buildroot}%{user_unit_dir}/service.d/10-timeout-abort.conf
 
 # https://fedoraproject.org/wiki/Changes/IncreaseVmMaxMapCount
 install -Dm0644 -t %{buildroot}%{_prefix}/lib/sysctl.d/ %{SOURCE17}
@@ -944,7 +940,7 @@ if [ $1 -ge 1 ]; then
   systemd-tmpfiles --create &>/dev/null || :
 fi
 
-%systemd_postun_with_restart systemd-timedated.service systemd-hostnamed.service systemd-journald.service systemd-localed.service systemd-userdbd.service
+%systemd_postun_with_restart systemd-timedated.service systemd-hostnamed.service systemd-journald.service systemd-localed.service
 
 # FIXME: systemd-logind.service is excluded (https://github.com/systemd/systemd/pull/17558)
 
@@ -1107,6 +1103,10 @@ rm -f .file-list-*
 rm -f %{name}.lang
 
 %changelog
+* Mon Jul 22 2024 systemd maintenance team <systemd-maint@redhat.com> - 256-7
+- drop 10-timeout-abort.conf snippet (RHEL-46280)
+- don't ship systemd-userdbd (RHEL-46280)
+
 * Fri Jul 19 2024 systemd maintenance team <systemd-maint@redhat.com> - 256-6
 - doc: add downstream CONTRIBUTING document (RHEL-40924)
 - ci: allow `policy` as rhel-only keyword (RHEL-40924)