diff --git a/ChangeLog b/ChangeLog
index 191ce8a34..8ce849620 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Remove -Werror which causes build to fail on some systems
+
+	* conf/i386-pc.rmk (xnu_mod_CFLAGS): Remove -Werror -Wall
+	* conf/i386-efi.rmk (xnu_mod_CFLAGS): Likewise
+	* conf/x86_64-efi.rmk (xnu_mod_CFLAGS): Likewise
+	
 2009-05-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	trampoline for linux on 64-bit platform
diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index 16ccea679..91e271d8c 100644
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -191,7 +191,7 @@ fixvideo_mod_LDFLAGS = $(COMMON_LDFLAGS)
 pkglib_MODULES += xnu.mod
 xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c\
 	 loader/macho.c loader/xnu.c loader/i386/xnu_helper.S
-xnu_mod_CFLAGS = $(COMMON_CFLAGS) -Werror -Wall
+xnu_mod_CFLAGS = $(COMMON_CFLAGS)
 xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
 xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index d51fa9b02..a72d2d246 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -239,7 +239,7 @@ linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 pkglib_MODULES += xnu.mod
 xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/pc/xnu.c\
 	 loader/macho.c loader/xnu.c loader/i386/xnu_helper.S
-xnu_mod_CFLAGS = $(COMMON_CFLAGS) -Werror -Wall
+xnu_mod_CFLAGS = $(COMMON_CFLAGS)
 xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
 xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 5d342b37f..ef36057ff 100644
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -189,7 +189,7 @@ fixvideo_mod_LDFLAGS = $(COMMON_LDFLAGS)
 pkglib_MODULES += xnu.mod
 xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c\
 	 loader/macho.c loader/xnu.c loader/i386/xnu_helper.S
-xnu_mod_CFLAGS = $(COMMON_CFLAGS) -Werror -Wall
+xnu_mod_CFLAGS = $(COMMON_CFLAGS)
 xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
 xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)