diff --git a/glibc-gcc-PR69537.patch b/glibc-gcc-PR69537.patch
deleted file mode 100644
index 9f395d5..0000000
--- a/glibc-gcc-PR69537.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Work around incorrect -Wmaybe-uninitialized warning due to this GCC bug:
-
-  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69537
-
-Index: glibc-2.22-709-g8a71d2e/nis/ypclnt.c
-===================================================================
---- glibc-2.22-709-g8a71d2e.orig/nis/ypclnt.c
-+++ glibc-2.22-709-g8a71d2e/nis/ypclnt.c
-@@ -584,7 +584,7 @@ yp_master (const char *indomain, const c
- {
-   ypreq_nokey req;
-   ypresp_master resp;
--  enum clnt_stat result;
-+  int result;
- 
-   if (indomain == NULL || indomain[0] == '\0' ||
-       inmap == NULL || inmap[0] == '\0')
diff --git a/glibc.spec b/glibc.spec
index d0ba5bd..4127b10 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -284,8 +284,6 @@ Patch2027: glibc-rh819430.patch
 
 Patch2031: glibc-rh1070416.patch
 
-Patch2036: glibc-gcc-PR69537.patch
-
 # extend_alloca removal, BZ 18023
 Patch2037: glibc-rh1315108.patch
 
@@ -849,7 +847,6 @@ microbenchmark tests on the system.
 %patch0053 -p1
 %patch0059 -p1
 %patch0060 -p1
-%patch2036 -p1
 %patch2037 -p1
 %patch2112 -p1
 %patch0061 -p1
@@ -2260,6 +2257,7 @@ rm -f *.filelist*
 %changelog
 * Wed Jun 21 2017 Florian Weimer <fweimer@redhat.com> - 2.25.90-9
 - Drop historic aarch64 TLS patches
+- Drop workaround for GCC PR69537
 - Auto-sync with upstream master,
   commit 9649350d2ee47fae00794d57e2526aa5d67d900e.