diff --git a/src/Makefile.linux b/src/Makefile.linux
index 762437af5..67afd4244 100644
--- a/src/Makefile.linux
+++ b/src/Makefile.linux
@@ -29,9 +29,13 @@ NON_AUTO_MEDIA = linux
 # Compiler flags for building host API wrapper
 #
 LINUX_CFLAGS	+= -Os -idirafter include -DSYMBOL_PREFIX=$(SYMBOL_PREFIX)
+LINUX_CFLAGS	+= -Wall -W
 ifneq ($(SYSROOT),)
 LINUX_CFLAGS	+= --sysroot=$(SYSROOT)
 endif
+ifneq ($(NO_WERROR),1)
+LINUX_CFLAGS	+= -Werror
+endif
 
 # Check for libslirp
 #