diff --git a/Makefile.am b/Makefile.am
index ad4e6180..7771a6e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,6 +46,7 @@ endif
 if GCC
 # These are good warnings to be treated as errors
 AM_CXXFLAGS += \
+	-Werror \
 	-Werror=missing-braces \
 	-Werror=non-virtual-dtor \
 	-Werror=overloaded-virtual \
diff --git a/Makefile.in b/Makefile.in
index 2d2bd9b4..2de8fd3e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -131,6 +131,7 @@ host_triplet = @host@
 
 # These are good warnings to be treated as errors
 @GCC_TRUE@am__append_2 = \
+@GCC_TRUE@	-Werror \
 @GCC_TRUE@	-Werror=missing-braces \
 @GCC_TRUE@	-Werror=non-virtual-dtor \
 @GCC_TRUE@	-Werror=overloaded-virtual \