diff --git a/Makefile.am b/Makefile.am
index bb2bc72eb..719561c83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=clutter doc tests
+SUBDIRS = clutter doc tests
 
 pcfiles = clutter-@CLUTTER_FLAVOUR@-@CLUTTER_MAJORMINOR@.pc
 
@@ -8,7 +8,7 @@ pcfiles = clutter-@CLUTTER_FLAVOUR@-@CLUTTER_MAJORMINOR@.pc
 pkgconfig_DATA = $(pcfiles)
 pkgconfigdir   = $(libdir)/pkgconfig
 
-DEFAULT_FLAVOUR=@CLUTTER_FLAVOUR@
+DEFAULT_FLAVOUR = @CLUTTER_FLAVOUR@
 install-data-hook:
 	(cd $(DESTDIR)$(pkgconfigdir) && \
 	 test -f clutter-$(DEFAULT_FLAVOUR)-@CLUTTER_MAJORMINOR@.pc && \
@@ -22,7 +22,7 @@ EXTRA_DIST = clutter.pc.in HACKING
 
 CLEANFILES = $(pcfiles)
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-maintainer-flags
 
 # Extra clean files so that maintainer-clean removes *everything*
 MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub \
diff --git a/configure.ac b/configure.ac
index 69cf687e1..c4fe8bb02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -315,6 +315,22 @@ fi
 
 AC_SUBST(FIXED_POINT_CFLAGS)
 
+dnl = Enable strict compiler flags =========================================
+
+# use strict compiler flags only on development releases
+#m4_define([maintainer_flags_default],
+#          m4_if(m4_eval(clutter_minor_version % 2), [1], [yes], [no]))
+m4_define([maintainer_flags_default], [no])
+AC_ARG_ENABLE([maintainer-flags],
+              AC_HELP_STRING([--enable-maintainer-flags=@<:@no/yes@:>@],
+                             [Use strict compiler flags @<:@default=maintainer_flags_default@:>@]),,
+              enable_maintainer_flags=maintainer_flags_default)
+
+if test "x$enable_maintainer_flags" = "xyes"; then
+  CPPFLAGS="$CPPFLAGS -Werror -Wall -Wshadow -Wcast-align -Wno-uninitialized"
+fi
+
+
 dnl = GTK Doc check ========================================================
 
 GTK_DOC_CHECK([1.6])
@@ -383,11 +399,15 @@ echo "                 ==================="
 echo ""
 echo "                   prefix:   ${prefix}"
 echo ""
-echo "                  Flavour:   ${clutterbackend}"
+echo "                  Flavour:   ${clutterbackend}/${CLUTTER_COGL}"
 echo "           Target library:   ${clutterbackendlib}"
 echo "              Debug level:   ${enable_debug}"
+<<<<<<< HEAD:configure.ac
 echo "      Fast FP conversions:   ${enable_fast_fp_conversions}"
+=======
+echo "           Compiler flags:   ${CPPFLAGS}"
+>>>>>>> Enable strict compiler flags with a configure flag:configure.ac
 echo "        API Documentation:   ${enable_gtk_doc}"
 echo "     Manual Documentation:   ${enable_manual}"
-echo "                      FPU:   ${with_fpu}"
+echo "              FPU Support:   ${with_fpu}"
 echo ""