diff --git a/Makefile.am b/Makefile.am
index 04417e7..1255a9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,11 @@
 ACLOCAL_AMFLAGS = -I config -I m4
 SUBDIRS = lib
 AUTOMAKE_OPTIONS = subdir-objects
-AM_CFLAGS = -Wall -Wextra -Werror
+AM_CFLAGS = -Wall -Wextra
+
+if ENABLE_WERROR
+AM_CFLAGS += -Werror
+endif
 
 bin_PROGRAMS = tacc
 tacc_SOURCES = tacc.c
diff --git a/configure.ac b/configure.ac
index 6914561..5cadca2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ See the included file: LICENSE for copyright information.
 ])
 AC_INIT([pam_tacplus],[1.7.0],[https://github.com/kravietz/pam_tacplus/issues/],[pam_tacplus],[https://github.com/kravietz/pam_tacplus/])
 AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+AM_INIT_AUTOMAKE([foreign -Wall])
 AC_CONFIG_SRCDIR([pam_tacplus.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([config])