diff --git a/ChangeLog b/ChangeLog
index fd8686322..773b6057b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* Makefile.util.def (libgrubmods.a): Add -Wno-error=logical-op
+	-Wno-error=missing-noreturn.
+
 2012-02-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/affs.c (grub_affs_read_block): Avoid <= in loop
diff --git a/Makefile.util.def b/Makefile.util.def
index 98a7e1ecb..d5176793c 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -36,7 +36,7 @@ library = {
 
 library = {
   name = libgrubmods.a;
-  cflags = '$(CFLAGS_POSIX) -Wno-undef';
+  cflags = '$(CFLAGS_POSIX) -Wno-undef -Wno-error=logical-op -Wno-error=missing-noreturn';
   cppflags = '-I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H';
 
   common_nodist = grub_script.tab.c;