diff --git a/glibc-gcc-PR69537.patch b/glibc-gcc-PR69537.patch
new file mode 100644
index 0000000..9f395d5
--- /dev/null
+++ b/glibc-gcc-PR69537.patch
@@ -0,0 +1,17 @@
+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 1857df5..0eb0b57 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir  glibc-2.22-709-g8a71d2e
 %define glibcversion 2.22.90
-%define glibcrelease 30%{?dist}
+%define glibcrelease 31%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -290,6 +290,7 @@ Patch2034: glibc-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch
 
 # Group Merge Patch:
 Patch2035: glibc-nsswitch-Add-group-merging-support.patch
+Patch2036: glibc-gcc-PR69537.patch
 
 ##############################################################################
 #
@@ -683,6 +684,7 @@ cat /proc/meminfo
 %patch0058 -p1
 %patch0059 -p1
 %patch2035 -p1
+%patch2036 -p1
 
 ##############################################################################
 # %%prep - Additional prep required...
@@ -1941,6 +1943,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu Jan 28 2016 Florian Weimer <fweimer@redhat.com> - 2.22.90-31
+- Add workaround for GCC PR69537.
+
 * Thu Jan 28 2016 Florian Weimer <fweimer@redhat.com> - 2.22.90-30
 - Auto-sync with upstream master.
 
diff --git a/series b/series
index 11bfbcd..e33ce36 100644
--- a/series
+++ b/series
@@ -37,3 +37,4 @@ glibc-dns-host-gcc5.patch -p1 --fuzz=0
 glibc-bug-regex-gcc5.patch -p1 --fuzz=0
 glibc-c-utf8-locale.patch -p1 --fuzz=0
 glibc-nsswitch-Add-group-merging-support.patch -p1 --fuzz=0
+glibc-gcc-PR69537.patch