diff --git a/ChangeLog b/ChangeLog
index 469968176..686ef0ebc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-01  Manoel Abranches  <mrabran@linux.vnet.ibm.com>
+
+	* aclocal.m4: Move --build-id=none from MODULE_LDFLAGS to
+	TARGET_LDFLAGS.  This corrects a problem with grub-mkelfimage.
+
 2009-04-01  David S. Miller  <davem@davemloft.net>
 
 	* normal/sparc64/setjmp.S: Fix setjmp implementation.
diff --git a/aclocal.m4 b/aclocal.m4
index afd135d8f..779df3d39 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -112,7 +112,7 @@ LDFLAGS="$save_LDFLAGS"
 AC_MSG_RESULT([$grub_cv_prog_ld_build_id_none])
 
 if test "x$grub_cv_prog_ld_build_id_none" = xyes; then
-  MODULE_LDFLAGS="$MODULE_LDFLAGS -Wl,--build-id=none"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,--build-id=none"
 fi
 ])
 
diff --git a/configure b/configure
index d1f476d44..84291ecbc 100644
--- a/configure
+++ b/configure
@@ -7649,7 +7649,7 @@ fi
 $as_echo "$grub_cv_prog_ld_build_id_none" >&6; }
 
 if test "x$grub_cv_prog_ld_build_id_none" = xyes; then
-  MODULE_LDFLAGS="$MODULE_LDFLAGS -Wl,--build-id=none"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,--build-id=none"
 fi