diff --git a/glibc-sparc64-fxstat.diff b/glibc-sparc64-fxstat.diff
new file mode 100644
index 0000000..fa06e5a
--- /dev/null
+++ b/glibc-sparc64-fxstat.diff
@@ -0,0 +1,7 @@
+Index: glibc-2.10.1/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
+===================================================================
+--- glibc-2.10.1.orig/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
++++ glibc-2.10.1/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
+@@ -1 +1 @@
+-#include "../../fxstat.c"
++#include "../../i386/fxstat.c"
diff --git a/glibc.changes b/glibc.changes
index 16e8151..805cb96 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jul  1 19:52:56 UTC 2010 - jengelh@medozas.de
+
+- SPARC: restore fxstat functionality in sparc64 mode
+
 -------------------------------------------------------------------
 Sat Jun 26 10:26:17 UTC 2010 - jengelh@medozas.de
 
diff --git a/glibc.spec b/glibc.spec
index 5cd719f..155e90d 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -141,6 +141,8 @@ Patch500:       ARM_glibc-2.10.1-local-eabi-wchar.diff
 Patch501:       ARM_glibc-2.10.1-local-hwcap-updates.diff 
 Patch502:       ARM_glibc-2.10.1-local-lowlevellock.diff
 Patch503:       ARM_glibc-2.10.1-local-no-hwcap.diff
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=11155
+Patch600:	glibc-sparc64-fxstat.diff
 
 %description
 The GNU C Library provides the most important standard libraries used
@@ -363,6 +365,7 @@ rm nscd/s-stamp
 %patch502
 %patch503
 %endif
+%patch600 -p1
 #
 # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed!
 #