diff --git a/sflphone-client-gnome/configure.ac b/sflphone-client-gnome/configure.ac
index e792a2bf289e5430ddfc13abc0aab2af9254d9eb..8511fbbf6d392d576b740eb719fa05db0540a988 100644
--- a/sflphone-client-gnome/configure.ac
+++ b/sflphone-client-gnome/configure.ac
@@ -24,7 +24,7 @@ AC_ARG_WITH(debug,
 if test "x$with_debug" = "xfull" -o "x$with_debug" = "xyes"; then
 	CFLAGS="-g -O0 -DDEBUG -Wall -Wextra"
 else
-	CFLAGS="$CFLAGS -Wall -Wextra -Werror"
+	CFLAGS="$CFLAGS -Wall -Wextra"
 fi
 
 AC_PROG_CC
diff --git a/sflphone-common/globals.mak b/sflphone-common/globals.mak
index 82d93933f2b3021a08126d10db88adbb8267fd4a..16656d11a2b224e4893a497affd2bc629f55429d 100644
--- a/sflphone-common/globals.mak
+++ b/sflphone-common/globals.mak
@@ -1,6 +1,6 @@
 # Global variables
 
-CXXFLAGS=-Wall -Werror -Wextra
+#CXXFLAGS=-Wall -Werror -Wextra
 
 src=$(top_srcdir)
 sfllibdir=$(DESTDIR)$(libdir)/sflphone