diff --git a/glibc-rh2213907-7.patch b/glibc-rh2213907-7.patch
new file mode 100644
index 0000000..bf41368
--- /dev/null
+++ b/glibc-rh2213907-7.patch
@@ -0,0 +1,37 @@
+commit 885a7f0feee951f514a121788f46f33b2867110f
+Author: Noah Goldstein <goldstein.w.n@gmail.com>
+Date:   Fri Aug 11 12:29:11 2023 -0500
+
+    x86: Fix incorrect scope of setting `shared_per_thread` [BZ# 30745]
+    
+    The:
+    
+    ```
+        if (shared_per_thread > 0 && threads > 0)
+          shared_per_thread /= threads;
+    ```
+    
+    Code was accidentally moved to inside the else scope.  This doesn't
+    match how it was previously (before af992e7abd).
+    
+    This patch fixes that by putting the division after the `else` block.
+
+diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h
+index aed1a7be56610e99..f950e488cfbe42dd 100644
+--- a/sysdeps/x86/dl-cacheinfo.h
++++ b/sysdeps/x86/dl-cacheinfo.h
+@@ -770,11 +770,10 @@ get_common_cache_info (long int *shared_ptr, long int * shared_per_thread_ptr, u
+ 	     level.  */
+ 	  threads = ((cpu_features->features[CPUID_INDEX_1].cpuid.ebx >> 16)
+ 		     & 0xff);
+-
+-	  /* Get per-thread size of highest level cache.  */
+-	  if (shared_per_thread > 0 && threads > 0)
+-	    shared_per_thread /= threads;
+ 	}
++      /* Get per-thread size of highest level cache.  */
++      if (shared_per_thread > 0 && threads > 0)
++	shared_per_thread /= threads;
+     }
+ 
+   /* Account for non-inclusive L2 and L3 caches.  */
diff --git a/glibc.spec b/glibc.spec
index e8a12b5..b055feb 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -155,7 +155,7 @@ end \
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 81%{?dist}
+Release: 82%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -746,6 +746,7 @@ Patch505: glibc-rh2213907-6.patch
 Patch506: glibc-rh2166710-2.patch
 Patch507: glibc-rh2166710-3.patch
 Patch508: glibc-rh2222188-6.patch
+Patch509: glibc-rh2213907-7.patch
 
 ##############################################################################
 # Continued list of core "glibc" package information:
@@ -2903,6 +2904,9 @@ update_gconv_modules_cache ()
 %endif
 
 %changelog
+* Tue Aug 15 2023 Carlos O'Donell <carlos@redhat.com> - 2.34-82
+- Fix string and memory function tuning on small systems (#2213907) 
+
 * Mon Aug 14 2023 Florian Weimer <fweimer@redhat.com> - 2.34-81
 - Fix additional GCC 13 build issue (#2222188)