diff --git a/Makefile b/Makefile
index 372284d6a0c..fb665c26b44 100644
--- a/Makefile
+++ b/Makefile
@@ -122,7 +122,7 @@ LDFLAGS += $(LDFLAGS_$(CONFIG))
 
 CFLAGS += -std=c89 -pedantic
 CXXFLAGS += -std=c++11
-CPPFLAGS += -g -fPIC -Wall -Werror -Wno-long-long
+CPPFLAGS += -g -fPIC -Wall -Wextra -Wno-long-long
 LDFLAGS += -g -fPIC
 
 INCLUDES = . include gens
diff --git a/templates/Makefile.template b/templates/Makefile.template
index a3de50c0811..6f196ebec1c 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -139,7 +139,7 @@ LDFLAGS += $(LDFLAGS_$(CONFIG))
 
 CFLAGS += -std=c89 -pedantic
 CXXFLAGS += -std=c++11
-CPPFLAGS += -g -fPIC -Wall -Werror -Wno-long-long
+CPPFLAGS += -g -fPIC -Wall -Wextra -Wno-long-long
 LDFLAGS += -g -fPIC
 
 INCLUDES = . include gens