diff --git a/glibc.spec b/glibc.spec
index f4fd5e5..843e4c4 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%global glibcsrcdir glibc-2.36-9-g5c62874f42
+%global glibcsrcdir glibc-2.36-38-gdf51334828
 %global glibcversion 2.36
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
@@ -159,7 +159,7 @@ Version: %{glibcversion}
 # - It allows using the Release number without the %%dist tag in the dependency
 #   generator to make the generated requires interchangeable between Rawhide
 #   and ELN (.elnYY < .fcXX).
-%global baserelease 3
+%global baserelease 4
 Release: %{baserelease}%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
@@ -2185,6 +2185,39 @@ update_gconv_modules_cache ()
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Wed Sep 14 2022 Florian Weimer <fweimer@redhat.com> - 2.36-4
+- Auto-sync with upstream branch release/2.36/master,
+  commit df51334828f2af214105aad82042140ee3a6de0a:
+- elf: Run tst-audit-tlsdesc, tst-audit-tlsdesc-dlopen everywhere
+- NEWS: Note bug 12154 and bug 29305 as fixed
+- resolv: Fix building tst-resolv-invalid-cname for earlier C standards
+- nss_dns: Rewrite _nss_dns_gethostbyname4_r using current interfaces
+- resolv: Add new tst-resolv-invalid-cname
+- nss_dns: In gaih_getanswer_slice, skip strange aliases (bug 12154)
+- nss_dns: Rewrite getanswer_r to match getanswer_ptr (bug 12154, bug 29305)
+- nss_dns: Remove remnants of IPv6 address mapping
+- nss_dns: Rewrite _nss_dns_gethostbyaddr2_r and getanswer_ptr
+- nss_dns: Split getanswer_ptr from getanswer_r
+- resolv: Add DNS packet parsing helpers geared towards wire format
+- resolv: Add internal __ns_name_length_uncompressed function
+- resolv: Add the __ns_samebinaryname function
+- resolv: Add internal __res_binary_hnok function
+- resolv: Add tst-resolv-aliases
+- resolv: Add tst-resolv-byaddr for testing reverse lookup
+- nscd: Fix netlink cache invalidation if epoll is used [BZ #29415]
+- Add NEWS entry for CVE-2022-39046
+- syslog: Remove extra whitespace between timestamp and message (BZ#29544)
+- elf: Restore how vDSO dependency is printed with LD_TRACE_LOADED_OBJECTS (BZ #29539)
+- Apply asm redirections in wchar.h before first use (rhbz#2115752)
+- elf: Call __libc_early_init for reused namespaces (bug 29528)
+- syslog: Fix large messages (BZ#29536)
+- Linux: Fix enum fsconfig_command detection in <sys/mount.h> (rhbz#2126522)
+- linux: Fix sys/mount.h usage with kernel headers (rhbz#2126522)
+- linux: Use compile_c_snippet to check linux/mount.h availability
+- linux: Mimic kernel defition for BLOCK_SIZE
+- linux: Use compile_c_snippet to check linux/pidfd.h availability
+- glibcextract.py: Add compile_c_snippet
+
 * Tue Sep 06 2022 Arjun Shankar <arjun@redhat.com> - 2.36-3
 - Co-Authored-By: Benjamin Herrenschmidt <benh@amazon.com>
 - Retain .gnu_debuglink section in libc.so.6 (#2090744)
diff --git a/sources b/sources
index e50e056..a2b5a14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.36-9-g5c62874f42.tar.xz) = be64a3b51197b252186686e40e860f4f346ac6ea8f86a74cbf91e1c1c937835a27e08f7f209c7f303c5976e41b97e8e4b9f0f758183239599454101df0eaf71f
+SHA512 (glibc-2.36-38-gdf51334828.tar.xz) = 7e432feba30ebec6272400a16a9ece3ad5ce19e61250b696bfb613d36857c71abb9a22f7aad0e19e7e3c3d458e7633f7f75d93f9f7c20be2bae0c5aab9f9241a