diff --git a/ChangeLog b/ChangeLog
index 039df439fa..8a16ab16a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2012-05-31  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14117]
+	* sysdeps/unix/sysv/linux/x86_64/bits/epoll.h: Renamed to ...
+	* sysdeps/unix/sysv/linux/x86/bits/epoll.h: This.
+
 	* sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Removed.
 	* sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Renamed to ...
 	* sysdeps/unix/sysv/linux/x86/bits/fcntl.h: This.
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/epoll.h b/sysdeps/unix/sysv/linux/x86/bits/epoll.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/x86_64/bits/epoll.h
rename to sysdeps/unix/sysv/linux/x86/bits/epoll.h