diff --git a/configure.ac b/configure.ac
index 31bbe7a..3d1f88a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,9 @@ if test "x$ac_cv_env_CFLAGS_set" != "xset"; then
   CFLAGS="-O2"
 fi
 
+STRICT_CFLAGS="-Wall -Wextra -Werror -pipe -Wpedantic -Wconversion -Wshadow"
+AC_SUBST([STRICT_CFLAGS])
+
 AM_PROG_AR
 
 LT_PREREQ([2.2])
@@ -47,7 +50,7 @@ AC_MSG_NOTICE([
   ---------------
   prefix : $prefix
   CC     : $CC
-  CFLAGS : $CFLAGS
+  CFLAGS : $STRICT_CFLAGS
   tests  : $enable_tests
 ])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index d6944b8..a25a618 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,7 @@ libcli_la_SOURCES = \
 	parse_utils/parse_hex.c
 
 libcli_la_CPPFLAGS	= -I$(top_srcdir)/include
-libcli_la_CFLAGS	= -std=c99 -Wall -Wextra
+libcli_la_CFLAGS	= -std=c99 $(STRICT_CFLAGS)
 
 # Libtool versioning: current:revision:age
 libcli_la_LDFLAGS	= -version-info 0:1:0
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e9dc1e6..cbda0a9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include $(CRITERION_CFLAGS)
-AM_CFLAGS   = -std=c99
+AM_CFLAGS   = -std=c99 $(STRICT_CFLAGS)
 
 check_PROGRAMS = test_cli