diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 51780bc2f2b21bdb4622506e3a44afe0e7e39e25..c48e0ecd09df8af6bfe1c662d385097b59557753 100644
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -599,6 +599,11 @@ if test $target_cpu == "powerpc64"; then
 	CC="$CC -m64"
 fi
 
+/* Enable -Werror */
+if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
+	CFLAGS="$CFLAGS -Werror"
+fi
+
 CPPFLAGS="-I\$(top_builddir)/$LIBCFS_INCLUDE_DIR -I\$(top_srcdir)/$LIBCFS_INCLUDE_DIR-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
 
 LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"