diff --git a/ChangeLog b/ChangeLog
index 755ca1d99f..289475c20c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-10-17  Ulrich Drepper  <drepper@gmail.com>
 
+	* sysdeps/x86_64/fpu/bits/mathinline.h (floor): Use correct function
+	name.
+	(floorf): Likewise.
+
 	* nscd/netgroupcache.c (addgetnetgrentX): Fix #ifdef nesting.
 
 2011-10-17  Andreas Schwab  <schwab@redhat.com>
diff --git a/sysdeps/x86_64/fpu/bits/mathinline.h b/sysdeps/x86_64/fpu/bits/mathinline.h
index c3e03e8ca1..210bef8102 100644
--- a/sysdeps/x86_64/fpu/bits/mathinline.h
+++ b/sysdeps/x86_64/fpu/bits/mathinline.h
@@ -187,7 +187,7 @@ __END_NAMESPACE_C99
 __BEGIN_NAMESPACE_STD
 /* Largest integer not greater than X.  */
 __MATH_INLINE double
-__NTH (ceil (double __x))
+__NTH (floor (double __x))
 {
   double __res;
   __asm ("roundsd $1, %1, %0" : "=x" (__res) : "x" (__x));
@@ -197,7 +197,7 @@ __END_NAMESPACE_STD
 
 __BEGIN_NAMESPACE_C99
 __MATH_INLINE float
-__NTH (ceilf (float __x))
+__NTH (floorf (float __x))
 {
   float __res;
   __asm ("roundss $1, %1, %0" : "=x" (__res) : "x" (__x));