diff --git a/ChangeLog b/ChangeLog
index 1800170fde..e26298a167 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-04-01  Andreas Schwab  <schwab@redhat.com>
+
+	* sysdeps/unix/sysv/linux/Versions: Rename open_by_handle to
+	open_by_handle_at.
+	* sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise.
+	* sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Likewise.
+	* sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.
+	* sysdeps/unix/sysv/linux/syscalls.list: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Likewise.
+
 2011-04-01  Ulrich Drepper  <drepper@gmail.com>
 
 	* sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Define O_PATH.
diff --git a/NEWS b/NEWS
index 54257ac894..8aa9316d52 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@ using `glibc' in the "product" field.
 
 Version 2.14
 
-* New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle
+* New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at
 
 * The following bugs are resolved with this release:
 
diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
index 52d0cde118..29099dc5c0 100644
--- a/sysdeps/unix/sysv/linux/Versions
+++ b/sysdeps/unix/sysv/linux/Versions
@@ -157,7 +157,7 @@ libc {
   GLIBC_2.14 {
     clock_adjtime;
 
-    name_to_handle_at; open_by_handle;
+    name_to_handle_at; open_by_handle_at;
   }
   GLIBC_PRIVATE {
     # functions used in other libraries
diff --git a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
index e7a237eb74..6ff59bc429 100644
--- a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
@@ -314,8 +314,8 @@ extern int name_to_handle_at (int __dfd, const char *__name,
 
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
-extern int open_by_handle (int __mountdirfd, struct file_handle *__handle,
-			   int __flags);
+extern int open_by_handle_at (int __mountdirfd, struct file_handle *__handle,
+			      int __flags);
 
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h b/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
index 30df16db20..72f4b6ceab 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
@@ -312,8 +312,8 @@ extern int name_to_handle_at (int __dfd, const char *__name,
 
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
-extern int open_by_handle (int __mountdirfd, struct file_handle *__handle,
-			   int __flags);
+extern int open_by_handle_at (int __mountdirfd, struct file_handle *__handle,
+			      int __flags);
 
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
index b5ea6a9a5d..df039685a2 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
@@ -338,8 +338,8 @@ extern int name_to_handle_at (int __dfd, const char *__name,
 
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
-extern int open_by_handle (int __mountdirfd, struct file_handle *__handle,
-			   int __flags);
+extern int open_by_handle_at (int __mountdirfd, struct file_handle *__handle,
+			      int __flags);
 
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/sh/bits/fcntl.h b/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
index 784822cabf..bf2aa83c1c 100644
--- a/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
@@ -318,8 +318,8 @@ extern int name_to_handle_at (int __dfd, const char *__name,
 
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
-extern int open_by_handle (int __mountdirfd, struct file_handle *__handle,
-			   int __flags);
+extern int open_by_handle_at (int __mountdirfd, struct file_handle *__handle,
+			      int __flags);
 
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
index 544ff361e5..1271a12cec 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
@@ -325,8 +325,8 @@ extern int name_to_handle_at (int __dfd, const char *__name,
 
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
-extern int open_by_handle (int __mountdirfd, struct file_handle *__handle,
-			   int __flags);
+extern int open_by_handle_at (int __mountdirfd, struct file_handle *__handle,
+			      int __flags);
 
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index ed2d5f61c0..051303f07c 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -106,4 +106,4 @@ timerfd_gettime	EXTRA	timerfd_gettime	i:ip	timerfd_gettime
 fanotify_init	EXTRA	fanotify_init	i:ii	fanotify_init
 
 name_to_handle_at EXTRA	name_to_handle_at i:isppi name_to_handle_at
-open_by_handle	EXTRA	open_by_handle	Ci:ipi	open_by_handle
+open_by_handle_at EXTRA	open_by_handle_at Ci:ipi  open_by_handle_at
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
index f4a888d096..7f18562c12 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
@@ -332,8 +332,8 @@ extern int name_to_handle_at (int __dfd, const char *__name,
 
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
-extern int open_by_handle (int __mountdirfd, struct file_handle *__handle,
-			   int __flags);
+extern int open_by_handle_at (int __mountdirfd, struct file_handle *__handle,
+			      int __flags);
 
 #endif	/* use GNU */