diff --git a/ChangeLog b/ChangeLog
index 83322bb10..60ed1a6b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* conf/i386-pc.rmk (efiemu_mod_CFLAGS): remove -Werror -Wall
+	* conf/common.rmk (search_mod_CFLAGS): likewise
+
 2009-06-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/i386/pc/startup.S [APPLE_CC]: block of nops to 
diff --git a/conf/common.rmk b/conf/common.rmk
index 3e59c3aac..1d0427d94 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -423,7 +423,7 @@ help_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For search.mod.
 search_mod_SOURCES = commands/search.c
-search_mod_CFLAGS = $(COMMON_CFLAGS) -Werror -Wall
+search_mod_CFLAGS = $(COMMON_CFLAGS)
 search_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For test.mod.
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index fe67a8f60..0af07f994 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -203,7 +203,7 @@ efiemu_mod_SOURCES = efiemu/main.c efiemu/i386/loadcore32.c \
 		     efiemu/loadcore32.c efiemu/loadcore64.c \
 		     efiemu/prepare32.c efiemu/prepare64.c efiemu/pnvram.c \
 		     efiemu/i386/coredetect.c
-efiemu_mod_CFLAGS = $(COMMON_CFLAGS) -Werror -Wall
+efiemu_mod_CFLAGS = $(COMMON_CFLAGS)
 efiemu_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For acpi.mod.