diff --git a/.travis.yml b/.travis.yml
index 4fb80dd5..182aaaf2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ sudo: false
 
 language: c
 
-script: autoreconf -i && ./configure && make distcheck
+script: autoreconf -i && ./configure --enable-warning-as-error && make all distcheck
 
 compiler:
   - clang
diff --git a/configure.ac b/configure.ac
index bbfaf87b..bfcd74d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,6 +335,11 @@ AC_ARG_ENABLE([debug],
 	],
 	[])
 
+AC_ARG_ENABLE([warning-as-error],
+	[AS_HELP_STRING([--enable-warning-as-error],[stop build on warnings])],
+	CFLAGS="$CFLAGS -Werror",
+	[])
+
 AC_ARG_ENABLE([warning],
 	[AS_HELP_STRING([--enable-warning],[enable extra warning])],
 	[
@@ -343,7 +348,6 @@ AC_ARG_ENABLE([warning],
 	AC_CHECK_CC_OPT([-Wunused], CFLAGS="$CFLAGS -Wunused", [])
 	AC_CHECK_CC_OPT([-Wunreachable-code], CFLAGS="$CFLAGS -Wunreachable-code", [])
 	AC_CHECK_CC_OPT([-Wpadded], CFLAGS="$CFLAGS -Wpadded", [])
-	AC_CHECK_CC_OPT([-Wshadow], CFLAGS="$CFLAGS -Wshadow", [])
 	AC_CHECK_CC_OPT([-Weverything], CFLAGS="$CFLAGS -Weverything", [])
 	],
 	[])