diff --git a/ChangeLog b/ChangeLog
index 90dad72833..a9e69a3364 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-14  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	* sysdeps/unix/sysv/linux/rename.c: New file.
+	* sysdeps/unix/sysv/linux/generic/rename.c: Remove file.
+
 2015-12-14  Wilco Dijkstra  <wdijkstr@arm.com>
 
 	* benchtests/bench-strtok.c (oldstrtok): Add old implementation.
diff --git a/sysdeps/unix/sysv/linux/generic/rename.c b/sysdeps/unix/sysv/linux/rename.c
similarity index 69%
rename from sysdeps/unix/sysv/linux/generic/rename.c
rename to sysdeps/unix/sysv/linux/rename.c
index 174c147eb4..73f0ae43bd 100644
--- a/sysdeps/unix/sysv/linux/generic/rename.c
+++ b/sysdeps/unix/sysv/linux/rename.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 2011-2016 Free Software Foundation, Inc.
+/* Linux implementation for rename function.
+   Copyright (C) 2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -17,13 +17,19 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <stdio.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <sysdep.h>
+#include <errno.h>
 
 /* Rename the file OLD to NEW.  */
 int
 rename (const char *old, const char *new)
 {
-  return INLINE_SYSCALL (renameat, 4, AT_FDCWD, old, AT_FDCWD, new);
+#if defined (__NR_rename)
+  return INLINE_SYSCALL_CALL (rename, old, new);
+#elif defined (__NR_renameat)
+  return INLINE_SYSCALL_CALL (renameat, AT_FDCWD, old, AT_FDCWD, new);
+#else
+  return INLINE_SYSCALL_CALL (renameat2, AT_FDCWD, old, AT_FDCWD, new, 0);
+#endif
 }