diff --git a/ChangeLog b/ChangeLog
index 7a8391789..28d3e41c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Remove enable_executable_check as it's not needed anymore.
+	Reported by: dougray.
+
 2013-06-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/disk/diskfilter.c (insert_array): Fix order to discover
diff --git a/acinclude.m4 b/acinclude.m4
index 49a1a75d1..6242fa699 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -313,32 +313,6 @@ else
 fi
 ])
 
-dnl Check if the C compiler generates calls to `__enable_execute_stack()'.
-AC_DEFUN([grub_CHECK_ENABLE_EXECUTE_STACK],[
-AC_MSG_CHECKING([whether `$CC' generates calls to `__enable_execute_stack()'])
-AC_LANG_CONFTEST([AC_LANG_SOURCE([[
-void f (int (*p) (void));
-void g (int i)
-{
-  int nestedfunc (void) { return i; }
-  f (nestedfunc);
-}
-]])])
-if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -S conftest.c]) && test -s conftest.s; then
-  true
-else
-  AC_MSG_ERROR([${CC-cc} failed to produce assembly code])
-fi
-if grep __enable_execute_stack conftest.s >/dev/null 2>&1; then
-  NEED_ENABLE_EXECUTE_STACK=1
-  AC_MSG_RESULT([yes])
-else
-  NEED_ENABLE_EXECUTE_STACK=0
-  AC_MSG_RESULT([no])
-fi
-rm -f conftest*
-])
-
 
 dnl Check if the C compiler supports `-fstack-protector'.
 AC_DEFUN([grub_CHECK_STACK_PROTECTOR],[
diff --git a/config.h.in b/config.h.in
index 065db78b8..160e3717e 100644
--- a/config.h.in
+++ b/config.h.in
@@ -39,8 +39,6 @@
 #define GRUB_BOOT_DIR_NAME "@bootdirname@"
 /* Default grub directory name */
 #define GRUB_DIR_NAME "@grubdirname@"
-/* Define to 1 if GCC generates calls to __enable_execute_stack().  */
-#define NEED_ENABLE_EXECUTE_STACK @NEED_ENABLE_EXECUTE_STACK@
 /* Define to 1 if GCC generates calls to __register_frame_info().  */
 #define NEED_REGISTER_FRAME_INFO @NEED_REGISTER_FRAME_INFO@
 
diff --git a/configure.ac b/configure.ac
index 1c05a11f1..2f7b8b3c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1137,7 +1137,6 @@ AC_SUBST(BSS_START_SYMBOL)
 AC_SUBST(END_SYMBOL)
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
-AC_SUBST(NEED_ENABLE_EXECUTE_STACK)
 AC_SUBST(NEED_REGISTER_FRAME_INFO)
 
 #