diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index 208b56c..55a9120 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -2195,3 +2195,25 @@
  		return;
  	abbrvar = (stdrp == NULL) ? "" : stdrp->r_abbrvar;
  	doabbr(result, zp->z_format, abbrvar, FALSE, TRUE);
+2009-07-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S: Fix error
+	path when not using absolute timeout futex.
+
+--- libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
++++ libc/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+@@ -551,12 +551,12 @@ __pthread_cond_timedwait:
+ 	jne	53b
+ 
+ 	cmpq	24(%rsp), %r9
+-	jbe	45b
++	jbe	15f
+ 
+ 	cmpq	%rax, %r9
+ 	ja	39b
+ 
+-	cmpq	$-ETIMEDOUT, %r14
++15:	cmpq	$-ETIMEDOUT, %r14
+ 	jne	8b
+ 
+ 	jmp	99b
diff --git a/glibc.spec b/glibc.spec
index 146c8dc..8fa8bef 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -24,7 +24,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 7
+Release: 7.1
 # 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
@@ -1037,6 +1037,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri Jul 24 2009 Jakub Jelinek <jakub@redhat.com> - 2.10.90-7.1
+- Fix up pthread_cond_timedwait on x86_64 with old kernels.
+
 * Thu Jul 23 2009 Andreas Schwab <schwab@redhat.com> - 2.10.90-7
 - Update from master.
 - Build with -DNDEBUG unless using a prerelease.