diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am
index ef6c6c7..42155d5 100644
--- a/libindicator/Makefile.am
+++ b/libindicator/Makefile.am
@@ -57,7 +57,7 @@ libindicator_la_CFLAGS = \
 	$(LIBINDICATOR_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	-DG_LOG_DOMAIN=\"libindicator\" \
-	-Wall -Werror
+	-Wall -Wno-error
 
 libindicator_la_LIBADD = \
 	$(LIBINDICATOR_LIBS)
diff --git a/libindicator/Makefile.in b/libindicator/Makefile.in
index b22c62c..a4ffd55 100644
--- a/libindicator/Makefile.in
+++ b/libindicator/Makefile.in
@@ -330,7 +330,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@USE_GTK3_FALSE@VER = 
+@USE_GTK3_FALSE@VER =
 @USE_GTK3_TRUE@VER = 3
 @USE_GTK3_FALSE@lib_LTLIBRARIES = libindicator.la
 @USE_GTK3_TRUE@lib_LTLIBRARIES = libindicator3.la
@@ -380,7 +380,7 @@ libindicator_la_CFLAGS = \
 	$(LIBINDICATOR_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	-DG_LOG_DOMAIN=\"libindicator\" \
-	-Wall -Werror
+	-Wall -Wno-error
 
 libindicator_la_LIBADD = \
 	$(LIBINDICATOR_LIBS)
@@ -485,9 +485,9 @@ clean-libLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libindicator.la: $(libindicator_la_OBJECTS) $(libindicator_la_DEPENDENCIES) $(EXTRA_libindicator_la_DEPENDENCIES) 
+libindicator.la: $(libindicator_la_OBJECTS) $(libindicator_la_DEPENDENCIES) $(EXTRA_libindicator_la_DEPENDENCIES)
 	$(AM_V_CCLD)$(libindicator_la_LINK) $(am_libindicator_la_rpath) $(libindicator_la_OBJECTS) $(libindicator_la_LIBADD) $(LIBS)
-libindicator3.la: $(libindicator3_la_OBJECTS) $(libindicator3_la_DEPENDENCIES) $(EXTRA_libindicator3_la_DEPENDENCIES) 
+libindicator3.la: $(libindicator3_la_OBJECTS) $(libindicator3_la_DEPENDENCIES) $(EXTRA_libindicator3_la_DEPENDENCIES)
 	$(AM_V_CCLD)$(libindicator3_la_LINK) $(am_libindicator3_la_rpath) $(libindicator3_la_OBJECTS) $(libindicator3_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
diff --git a/tools/Makefile.am b/tools/Makefile.am
index cefd944..81ab010 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -17,7 +17,7 @@ indicator_loader_SOURCES = \
 	indicator-loader.c
 
 indicator_loader_CFLAGS = \
-	-Wall -Werror \
+	-Wall -Wno-error \
 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
 	-DBUILD_DIR="\"$(builddir)\""
 
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 03d7a29..e745350 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -293,7 +293,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @USE_GTK3_FALSE@INDICATOR_LIB = -lindicator
 @USE_GTK3_TRUE@INDICATOR_LIB = -lindicator3
-@USE_GTK3_FALSE@VER = 
+@USE_GTK3_FALSE@VER =
 @USE_GTK3_TRUE@VER = 3
 
 #############################
@@ -303,7 +303,7 @@ indicator_loader_SOURCES = \
 	indicator-loader.c
 
 indicator_loader_CFLAGS = \
-	-Wall -Werror \
+	-Wall -Wno-error \
 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
 	-DBUILD_DIR="\"$(builddir)\""
 
@@ -403,10 +403,10 @@ clean-libexecPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-indicator-loader$(EXEEXT): $(indicator_loader_OBJECTS) $(indicator_loader_DEPENDENCIES) $(EXTRA_indicator_loader_DEPENDENCIES) 
+indicator-loader$(EXEEXT): $(indicator_loader_OBJECTS) $(indicator_loader_DEPENDENCIES) $(EXTRA_indicator_loader_DEPENDENCIES)
 	@rm -f indicator-loader$(EXEEXT)
 	$(AM_V_CCLD)$(indicator_loader_LINK) $(indicator_loader_OBJECTS) $(indicator_loader_LDADD) $(LIBS)
-indicator-loader3$(EXEEXT): $(indicator_loader3_OBJECTS) $(indicator_loader3_DEPENDENCIES) $(EXTRA_indicator_loader3_DEPENDENCIES) 
+indicator-loader3$(EXEEXT): $(indicator_loader3_OBJECTS) $(indicator_loader3_DEPENDENCIES) $(EXTRA_indicator_loader3_DEPENDENCIES)
 	@rm -f indicator-loader3$(EXEEXT)
 	$(AM_V_CCLD)$(indicator_loader3_LINK) $(indicator_loader3_OBJECTS) $(indicator_loader3_LDADD) $(LIBS)