diff --git a/ChangeLog b/ChangeLog
index 5b5813869..76d843da3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
+2012-02-26  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/genmod.sh.in: Add -R .note.GNU-stack to strip.
+
 2012-02-26  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/disk/diskfilter.c (insert_array): Remove scanner_name
-	argument since it can be deduced from diskfilter.
+	argument since it can be deduced from diskfilter. All users updated.
 
 2012-02-26  Vladimir Serbinenko  <phcoder@gmail.com>
 
diff --git a/grub-core/genmod.sh.in b/grub-core/genmod.sh.in
index 4cab8e50e..4411c6b1b 100644
--- a/grub-core/genmod.sh.in
+++ b/grub-core/genmod.sh.in
@@ -60,7 +60,7 @@ if test x@TARGET_APPLE_CC@ != x1; then
 	    @STRIP@ --strip-unneeded \
 		-K grub_mod_init -K grub_mod_fini \
 		-K _grub_mod_init -K _grub_mod_fini \
-		-R .note -R .comment $tmpfile || exit 1
+		-R .note.GNU-stack -R .note -R .comment $tmpfile || exit 1
 	fi
 else
 # XXX Test these Apple CC fixes