diff --git a/src/Makefile b/src/Makefile
index c313bb5e..a567b922 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -101,12 +101,16 @@ DOXYGEN		?= doxygen
 #
 CFLAGS		+= -I include -I arch/$(ARCH)/include -I . -DARCH=$(ARCH)
 CFLAGS		+= -Os -ffreestanding
-CFLAGS		+= -Wall -W -Werror
+CFLAGS		+= -Wall -W
 CFLAGS		+= -g
 CFLAGS		+= $(EXTRA_CFLAGS)
 ASFLAGS		+= $(EXTRA_ASFLAGS)
 LDFLAGS		+= $(EXTRA_LDFLAGS)
 
+ifneq ($(NO_WERROR),1)
+CFLAGS		+= -Werror
+endif
+
 # CFLAGS for specific object types
 #
 CFLAGS_c	+=