diff --git a/ChangeLog b/ChangeLog
index 3cdf0d84a..229739dcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/genmod.sh.in: Remove ./ from TARGET_OBJ2ELF. Add quotes.
+
+	Based on patches from AROS.
+
 2013-09-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/Makefile.am: Override STRIP and RANLIB.
diff --git a/grub-core/genmod.sh.in b/grub-core/genmod.sh.in
index 95f4607c8..ff5cb19ae 100644
--- a/grub-core/genmod.sh.in
+++ b/grub-core/genmod.sh.in
@@ -54,7 +54,7 @@ if test x@TARGET_APPLE_CC@ != x1; then
     rm -f $t1 $t2
 
 	if ! test -z "${TARGET_OBJ2ELF}"; then
-	    ./${TARGET_OBJ2ELF} $tmpfile || exit 1
+	    "${TARGET_OBJ2ELF}" $tmpfile || exit 1
 	fi
 	if test x@platform@ != xemu; then
 	    @TARGET_STRIP@ --strip-unneeded \