diff --git a/SPECS/openvswitch3.5.spec b/SPECS/openvswitch3.5.spec
index 119825c..9c42535 100644
--- a/SPECS/openvswitch3.5.spec
+++ b/SPECS/openvswitch3.5.spec
@@ -27,6 +27,8 @@
 %define _rundir /run
 %endif
 
+%global rpm_supports_sysysers_m    %(rpm --version | awk -e '{print ($3 > 4.20)}')
+
 # FIXME Test "STP - flush the fdb and mdb when topology changed" fails on s390x
 # FIXME 2 tests fails on ppc64le. They will be hopefully fixed before official 2.11
 %ifarch %{ix86} x86_64 aarch64
@@ -57,7 +59,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.5.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -181,6 +183,9 @@ Requires: openssl iproute module-init-tools
 Requires: openvswitch-selinux-extra-policy
 
 %{?sysusers_requires_compat}
+%if ! %rpm_supports_sysysers_m
+Requires(post): /usr/sbin/usermod
+%endif
 Requires(post): /bin/sed
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -616,6 +621,9 @@ rm -f $RPM_BUILD_ROOT%{_includedir}/ovn/*
 %sysusers_create_compat %{SOURCE2}
 %ifarch %{dpdkarches}
 %sysusers_create_compat %{SOURCE3}
+%if ! %rpm_supports_sysysers_m
+usermod -a -G hugetlbfs openvswitch
+%endif
 %endif
 
 %post
@@ -788,6 +796,12 @@ exit 0
 %endif
 
 %changelog
+* Tue Mar 18 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.5.0-12
+- Merging redhat subtree [RH git: 39dbc86442]
+    Commit list:
+    1f4be55a70 Use usermod to add hugetlbfs group to openvswitch if rpm doesn't support it
+
+
 * Tue Mar 18 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.5.0-11
 - Merging upstream branch-3.5 [RH git: 8ff128c7e3]
     Commit list: