diff --git a/ChangeLog b/ChangeLog
index 6f33ff12a..10db262af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-16  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	* autogen.sh: Use "-f" in addition for "-h" when checking file presence.
+
 2013-04-15  Vladimir Serbinenko  <phcoder@gmail.com>
 2013-04-15  Peter Jones <pjones@redhat.com>
 
diff --git a/autogen.sh b/autogen.sh
index d47650b9b..48d7a6e82 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,7 +24,7 @@ ln -s ../../../grub-core/lib/libgcrypt-grub/src/g10lib.h include/grub/gcrypt/g10
 cp -R grub-core/lib/libgcrypt/mpi/generic grub-core/lib/libgcrypt-grub/mpi/generic
 
 for x in mpi-asm-defs.h mpih-add1.c mpih-sub1.c mpih-mul1.c mpih-mul2.c mpih-mul3.c mpih-lshift.c mpih-rshift.c; do
-    if [ -h grub-core/lib/libgcrypt-grub/mpi/"$x" ]; then
+    if [ -h grub-core/lib/libgcrypt-grub/mpi/"$x" ] || [ -f grub-core/lib/libgcrypt-grub/mpi/"$x" ]; then
 	rm grub-core/lib/libgcrypt-grub/mpi/"$x"
     fi
     ln -s generic/"$x" grub-core/lib/libgcrypt-grub/mpi/"$x"