diff --git a/ChangeLog b/ChangeLog
index 517eb95a3..d6c8f4a6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Remove APPLE_CC and add -Wl,-allow_stack_execute on
+	Apple.
+
 2012-05-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* gentpl.py: Ignore error 2022 in objconv since it's irrelevant for us.
diff --git a/configure.ac b/configure.ac
index e7133255a..943256651 100644
--- a/configure.ac
+++ b/configure.ac
@@ -301,8 +301,8 @@ AC_CHECK_SIZEOF(long)
 
 grub_apple_cc
 if test x$grub_cv_apple_cc = xyes ; then
-  HOST_CPPFLAGS="$HOST_CPPFLAGS -DAPPLE_CC=1 -fnested-functions"
-  HOST_CFLAGS="$HOST_CFLAGS"
+  HOST_CPPFLAGS="$HOST_CPPFLAGS -fnested-functions"
+  HOST_LDFLAGS="$HOST_LDFLAGS -Wl,-allow_stack_execute"
 fi
 
 if test x$USE_NLS = xno; then
@@ -453,10 +453,9 @@ fi
 
 grub_apple_target_cc
 if test x$grub_cv_apple_target_cc = xyes ; then
-  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DAPPLE_CC=1"
   TARGET_CPPFLAGS="$TARGET_CPPFLAGS -fnested-functions"
 
-  CFLAGS="$CFLAGS -DAPPLE_CC=1 -fnested-functions"
+  CFLAGS="$CFLAGS -fnested-functions"
   TARGET_APPLE_CC=1
   AC_CHECK_PROG([OBJCONV], [objconv], [objconv], [])
   if test "x$OBJCONV" = x ; then