diff --git a/shadow-utils.login.defs b/shadow-utils.login.defs
index e84c7ab..1e9129a 100644
--- a/shadow-utils.login.defs
+++ b/shadow-utils.login.defs
@@ -148,7 +148,7 @@ SYS_UID_MAX               999
 # Extra per user uids
 SUB_UID_MIN		   524288
 SUB_UID_MAX		600100000
-SUB_UID_COUNT		    65536
+SUB_UID_COUNT		        0
 
 #
 # Min/max values for automatic gid selection in groupadd(8)
@@ -161,7 +161,7 @@ SYS_GID_MAX               999
 # Extra per user group ids
 SUB_GID_MIN		   524288
 SUB_GID_MAX		600100000
-SUB_GID_COUNT		    65536
+SUB_GID_COUNT		        0
 
 #
 # Max number of login(1) retries if password is bad
diff --git a/shadow-utils.spec b/shadow-utils.spec
index eb9aebe..b853fee 100644
--- a/shadow-utils.spec
+++ b/shadow-utils.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for managing accounts and shadow password files
 Name: shadow-utils
 Version: 4.17.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 License: BSD-3-Clause AND GPL-2.0-or-later
 URL: https://github.com/shadow-maint/shadow
@@ -279,6 +279,10 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.a
 %{_libdir}/libsubid.so
 
 %changelog
+* Tue Jul 22 2025 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.17.4-2
+- Stop assigning subids by default
+  Resolves: CVE-2024-56433 and #2334169
+
 * Thu Mar 20 2025 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.17.4-1
 - Rebase to version 4.17.4. Resolves: #2353491
 - Fixes problems with expiration dates