diff --git a/ChangeLog b/ChangeLog
index d679336aa..1afed06f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-03  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* kern/misc.c: Disable the __enable_execute_stack hack for utilities.
+	* include/grub/misc.h: Likewise.
+
 2010-04-03  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* util/grub-install.in: Add `|| exit 1' to all grub-probe calls
diff --git a/include/grub/misc.h b/include/grub/misc.h
index 5b1477ed4..61174c38d 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -261,7 +261,7 @@ grub_size_t EXPORT_FUNC(grub_utf8_to_ucs4) (grub_uint32_t *dest,
 grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
 					  grub_uint32_t d, grub_uint32_t *r);
 
-#ifdef NEED_ENABLE_EXECUTE_STACK
+#if defined(NEED_ENABLE_EXECUTE_STACK) && !defined(GRUB_UTIL)
 void EXPORT_FUNC(__enable_execute_stack) (void *addr);
 #endif
 
diff --git a/kern/misc.c b/kern/misc.c
index 4772e22b0..9d8fc70da 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -1058,7 +1058,7 @@ grub_abort (void)
 void abort (void) __attribute__ ((alias ("grub_abort")));
 #endif
 
-#ifdef NEED_ENABLE_EXECUTE_STACK
+#if defined(NEED_ENABLE_EXECUTE_STACK) && !defined(GRUB_UTIL)
 /* Some gcc versions generate a call to this function
    in trampolines for nested functions.  */
 void __enable_execute_stack (void *addr __attribute__ ((unused)))