diff --git a/ChangeLog b/ChangeLog
index 946dcbd80..17e2643b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-19  Szymon Janc <szymon@janc.net.pl>
+
+	* Makefile.am (AUTOMAKE_OPTIONS): = Added -Wno-portability flag.
+	* grub-core/Makefile.am: Likewise.
+
 2011-08-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_iterate): Skip with
diff --git a/Makefile.am b/Makefile.am
index 9301c91a5..c5f486e0d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = subdir-objects -Wno-portability
 
 DEPDIR = .deps-util
 SUBDIRS = grub-core/gnulib . grub-core po docs util/bash-completion.d
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 3a085eb2c..f30014635 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = subdir-objects -Wno-portability
 
 DEPDIR=.deps-core