diff --git a/Makefile.am b/Makefile.am
index 999d613..511a161 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ else
AM_CFLAGS = -DNDEBUG -O2
endif
-AM_CFLAGS += -std=c89 -pedantic
+AM_CFLAGS += -std=c89 -pedantic -W -Wall -Werror
lib_LTLIBRARIES += librtbuf.la
librtbuf_la_CFLAGS = ${LIBRTBUF_CFLAGS}
diff --git a/configure.ac b/configure.ac
index 5dc85ee..4ff5763 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,5 @@
AC_PREREQ([2.59])
AC_INIT([rtbuf], [0.2.2], [kmx.io], [rtbuf], [http://kmx.io/])
-CFLAGS="$CFLAGS -W -Wall"
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([build-aux/m4])
AC_CONFIG_SRCDIR([rtbuf.c])