diff --git a/ChangeLog b/ChangeLog
index 1ed9f56dce..760d6873f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-08-27  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/i386/i686/multiarch/varshift.S: File removed.
+	* sysdeps/i386/i686/multiarch/varshift.c: New file.
+
 	* sysdeps/x86_64/multiarch/strlen-no-bsf.S: Move to .text.slow section.
 
 	* sysdeps/x86_64/strlen.S: Minimal code improvement.
diff --git a/sysdeps/i386/i686/multiarch/varshift.S b/sysdeps/i386/i686/multiarch/varshift.S
deleted file mode 100644
index 41afaf721c..0000000000
--- a/sysdeps/i386/i686/multiarch/varshift.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/x86_64/multiarch/varshift.S>
diff --git a/sysdeps/i386/i686/multiarch/varshift.c b/sysdeps/i386/i686/multiarch/varshift.c
new file mode 100644
index 0000000000..7760b966e2
--- /dev/null
+++ b/sysdeps/i386/i686/multiarch/varshift.c
@@ -0,0 +1 @@
+#include <sysdeps/x86_64/multiarch/varshift.c>