--- ./configure.ac.orig
+++ ./configure.ac
@@ -1092,7 +1092,7 @@
   if test x"$grub_cv_target_cc_efiemu64_link_format" = xunknown; then
     efiemu_excuse="no suitable link format for efiemu64 found"
   else
-    EFIEMU64_LINK_FORMAT="-Wl,$grub_cv_target_cc_efiemu64_link_format"
+    EFIEMU64_LINK_FORMAT="-Wl,$grub_cv_target_cc_efiemu64_link_format -no-pie"
   fi
 fi
 if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then
@@ -1188,7 +1188,7 @@
 [# Need that, because some distributions ship compilers that include
 # `-fPIE' and '-pie' in the default specs.
 if [ x"$pie_possible" = xyes ]; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE"
+  TARGET_CFLAGS="$TARGET_CFLAGS -no-pie"
 fi
 if [ x"$nopie_possible" = xyes ] &&  [ x"$pie_possible" = xyes ]; then
   TARGET_LDFLAGS="$TARGET_LDFLAGS -no-pie"