diff --git a/ChangeLog b/ChangeLog
index ae2868ffe0..1d71d936c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-10  Ilya Leoshkevich  <iii@linux.ibm.com>
+
+	* stdlib/Versions: Remove __fentry__.
+	* sysdeps/i386/Versions: Add __fentry__.
+	* sysdeps/x86_64/Versions: Add __fentry__.
+
 2018-08-10  Ilya Leoshkevich  <iii@linux.ibm.com>
 
 	* sysdeps/s390/Makefile: Register the new tests.
diff --git a/stdlib/Versions b/stdlib/Versions
index a2dfa322ed..9e665d4c26 100644
--- a/stdlib/Versions
+++ b/stdlib/Versions
@@ -105,9 +105,6 @@ libc {
   GLIBC_2.10 {
     quick_exit; __cxa_at_quick_exit;
   }
-  GLIBC_2.13 {
-    __fentry__;
-  }
   GLIBC_2.17 {
     secure_getenv;
   }
diff --git a/sysdeps/i386/Versions b/sysdeps/i386/Versions
index 7be44aad7a..36e23b466a 100644
--- a/sysdeps/i386/Versions
+++ b/sysdeps/i386/Versions
@@ -25,6 +25,9 @@ libc {
     __strpbrk_cg; __strpbrk_g; __strrchr_c; __strrchr_g; __strspn_c1;
     __strspn_cg; __strspn_g; __strstr_cg; __strstr_g;
   }
+  GLIBC_2.13 {
+    __fentry__;
+  }
 }
 libm {
   GLIBC_2.1 {
diff --git a/sysdeps/x86_64/Versions b/sysdeps/x86_64/Versions
index a437f85e6e..e94758b236 100644
--- a/sysdeps/x86_64/Versions
+++ b/sysdeps/x86_64/Versions
@@ -2,6 +2,9 @@ libc {
   GLIBC_2.14 {
     memcpy;
   }
+  GLIBC_2.13 {
+    __fentry__;
+  }
 }
 libm {
   GLIBC_2.1 {