diff --git a/examples/Makefile.am b/examples/Makefile.am
index f1d9751e..54ae69bd 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -15,7 +15,7 @@ if BUILD_EXAMPLES
 
 # picking up the default warning CFLAGS into AM_CFLAGS
 AM_CFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
-            $(WARNING_CFLAGS) $(DTLS_CFLAGS) -std=c99
+            $(WARNING_CFLAGS) $(DTLS_CFLAGS) -std=c99 $(EXTRA_CFLAGS)
 
 #
 
diff --git a/man/Makefile.am b/man/Makefile.am
index 3a80a2fa..12fb5b40 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -8,7 +8,7 @@
 # picking up the default warning CFLAGS into AM_CFLAGS
 AM_CFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
             -I$(top_srcdir)/include/coap$(LIBCOAP_API_VERSION) \
-            $(WARNING_CFLAGS) $(DTLS_CFLAGS) -std=c99
+            $(WARNING_CFLAGS) $(DTLS_CFLAGS) -std=c99 $(EXTRA_CFLAGS)
 
 # Build, not install
 noinst_PROGRAMS = examples-code-check
diff --git a/scripts/github_dist.sh b/scripts/github_dist.sh
index db448021..769e3ebb 100755
--- a/scripts/github_dist.sh
+++ b/scripts/github_dist.sh
@@ -17,7 +17,7 @@ if test $err = 0 -a "x$ARCHIVE" != "x"; then
     DIR=`pwd`/`tar taf $ARCHIVE |cut -d/ -f1|head -1`
     tar xaf $ARCHIVE && cd $DIR && \
         $DIR/configure $PREFIX --enable-tests  --enable-silent-rules --enable-documentation --enable-examples --disable-dtls && \
-        make && make install
+        make EXTRA_CFLAGS=-Werror && make install EXTRA_CFLAGS=-Werror
     err=$?
 fi
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bec6dfaf..7ad0f906 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,7 +11,7 @@
 if HAVE_CUNIT
 
 # picking up the default warning CFLAGS
-AM_CFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include $(WARNING_CFLAGS) $(CUNIT_CFLAGS) $(DTLS_CFLAGS) -std=c99
+AM_CFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include $(WARNING_CFLAGS) $(CUNIT_CFLAGS) $(DTLS_CFLAGS) -std=c99 $(EXTRA_CFLAGS)
 
 noinst_PROGRAMS = \
  testdriver