diff --git a/ChangeLog.m68k b/ChangeLog.m68k
index d631b40e4d..9d9b1812ee 100644
--- a/ChangeLog.m68k
+++ b/ChangeLog.m68k
@@ -1,3 +1,12 @@
+2012-04-17  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* sysdeps/m68k/m680x0/fpu/e_ilogb.c: Renamed from s_ilogb.c.
+	Define __ieee754_ilogb instead of __ilogb.
+	* sysdeps/m68k/m680x0/fpu/e_ilogbf.c: Renamed from s_ilogbf.c and
+	adjusted.
+	* sysdeps/m68k/m680x0/fpu/e_ilogbl.c: Renamed from s_ilogbl.c and
+	adjusted.
+
 2012-03-28  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* sysdeps/unix/sysv/linux/m68k/bits/mman.h (MAP_STACK)
diff --git a/sysdeps/m68k/m680x0/fpu/s_ilogb.c b/sysdeps/m68k/m680x0/fpu/e_ilogb.c
similarity index 88%
rename from sysdeps/m68k/m680x0/fpu/s_ilogb.c
rename to sysdeps/m68k/m680x0/fpu/e_ilogb.c
index ab4438aea2..41c597a012 100644
--- a/sysdeps/m68k/m680x0/fpu/s_ilogb.c
+++ b/sysdeps/m68k/m680x0/fpu/e_ilogb.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@
 #define m81(func) __m81_u(s(func))
 
 int
-s(__ilogb) (float_type x)
+s(__ieee754_ilogb) (float_type x)
 {
   float_type result;
   unsigned long x_cond;
@@ -45,6 +45,3 @@ s(__ilogb) (float_type x)
   __asm ("fgetexp%.x %1, %0" : "=f" (result) : "f" (x));
   return (int) result;
 }
-
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx (s(__ilogb), s(ilogb))
diff --git a/sysdeps/m68k/m680x0/fpu/s_ilogbf.c b/sysdeps/m68k/m680x0/fpu/e_ilogbf.c
similarity index 65%
rename from sysdeps/m68k/m680x0/fpu/s_ilogbf.c
rename to sysdeps/m68k/m680x0/fpu/e_ilogbf.c
index 4031c42ff7..34a8cd28e6 100644
--- a/sysdeps/m68k/m680x0/fpu/s_ilogbf.c
+++ b/sysdeps/m68k/m680x0/fpu/e_ilogbf.c
@@ -1,3 +1,3 @@
 #define SUFF f
 #define float_type float
-#include <s_ilogb.c>
+#include <e_ilogb.c>
diff --git a/sysdeps/m68k/m680x0/fpu/s_ilogbl.c b/sysdeps/m68k/m680x0/fpu/e_ilogbl.c
similarity index 68%
rename from sysdeps/m68k/m680x0/fpu/s_ilogbl.c
rename to sysdeps/m68k/m680x0/fpu/e_ilogbl.c
index 9c55a115e0..b0e13af6b1 100644
--- a/sysdeps/m68k/m680x0/fpu/s_ilogbl.c
+++ b/sysdeps/m68k/m680x0/fpu/e_ilogbl.c
@@ -1,3 +1,3 @@
 #define SUFF l
 #define float_type long double
-#include <s_ilogb.c>
+#include <e_ilogb.c>