diff --git a/glibc-rh804768.patch b/glibc-rh804768.patch
new file mode 100644
index 0000000..cdb081c
--- /dev/null
+++ b/glibc-rh804768.patch
@@ -0,0 +1,44 @@
+commit 0ab234b7db4991121eb572bf5c4971bfeb2d49a2
+Author: Andreas Krebbel <krebbel@linux.vnet.ibm.com>
+Date:   Wed Nov 7 08:44:35 2012 +0100
+
+    S/390: Sync AUXV capabilities and archs with kernel
+
+2012-11-07  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* sysdeps/s390/dl-procinfo.c (_dl_s390_cap_flags): Sync
+	_dl_s390_cap_flags with kernel. Increase string length.
+	(_dl_s390_platforms): Add z196 and zEC12.
+
+diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c
+index cd53b85..a22d45b 100644
+--- a/sysdeps/s390/dl-procinfo.c
++++ b/sysdeps/s390/dl-procinfo.c
+@@ -46,11 +46,11 @@
+ #if !defined PROCINFO_DECL && defined SHARED
+   ._dl_s390_cap_flags
+ #else
+-PROCINFO_CLASS const char _dl_s390_cap_flags[10][8]
++PROCINFO_CLASS const char _dl_s390_cap_flags[10][9]
+ #endif
+ #ifndef PROCINFO_DECL
+ = {
+-     "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", "hpage", "etf3enh", "highgprs"
++     "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", "edat", "etf3eh", "highgprs"
+   }
+ #endif
+ #if !defined SHARED || defined PROCINFO_DECL
+@@ -62,11 +62,11 @@ PROCINFO_CLASS const char _dl_s390_cap_flags[10][8]
+ #if !defined PROCINFO_DECL && defined SHARED
+   ._dl_s390_platforms
+ #else
+-PROCINFO_CLASS const char _dl_s390_platforms[5][7]
++PROCINFO_CLASS const char _dl_s390_platforms[7][7]
+ #endif
+ #ifndef PROCINFO_DECL
+ = {
+-    "g5", "z900", "z990", "z9-109", "z10"
++    "g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12"
+   }
+ #endif
+ #if !defined SHARED || defined PROCINFO_DECL
diff --git a/glibc.spec b/glibc.spec
index 2bdfc21..d6535c3 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -28,7 +28,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 22%{?dist}
+Release: 23%{?dist}
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -120,6 +120,7 @@ Patch1038: %{name}-rh805093.patch
 Patch1041: %{name}-rh848748.patch
 Patch1042: %{name}-rh865520.patch
 Patch1045: %{name}-rh852445.patch
+Patch1047: %{name}-rh804768.patch
 
 #
 # Patches submitted, but not yet approved upstream.
@@ -459,6 +460,7 @@ rm -rf %{glibcportsdir}
 %patch0044 -p1
 %patch1045 -p1
 %patch0046 -p1
+%patch1047 -p1
 
 # On powerpc32, hp timing is only available in power4/power6
 # libs, not in base, so pre-power4 dynamic linker is incompatible
@@ -1265,6 +1267,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed Nov 7 2012 Jeff Law <law@redhat.com> - 2.16-23
+  - Sync s390[x] auxv capabilities and archs with kernel (#804768)
+
 * Mon Oct 22 2012 Jeff Law <law@redhat.com> - 2.16-22
   - Include "sss" in /etc/nsswitch.conf (#867473)