diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4
index be5dc3de51..5f930756b0 100644
--- a/m4/virt-compile-warnings.m4
+++ b/m4/virt-compile-warnings.m4
@@ -171,7 +171,7 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
     # This should be < 256 really. Currently we're down to 4096,
     # but using 1024 bytes sized buffers (mostly for virStrerror)
     # stops us from going down further
-    gl_WARN_ADD([-Wframe-larger-than=4096], [STRICT_FRAME_LIMIT_CFLAGS])
+    wantwarn="$wantwarn -Wframe-larger-than=4096"
     gl_WARN_ADD([-Wframe-larger-than=32768], [RELAXED_FRAME_LIMIT_CFLAGS])
 
     # Extra special flags
diff --git a/src/Makefile.am b/src/Makefile.am
index 013976a2b7..cd01796d67 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,8 +31,6 @@ AM_CPPFLAGS =	-I../gnulib/lib \
 		-Dabs_top_srcdir="\"$(abs_top_srcdir)\"" \
 		$(NULL)
 
-WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS)
-
 AM_CFLAGS =	$(LIBXML_CFLAGS) \
 		$(GLIB_CFLAGS) \
 		$(WARN_CFLAGS) \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 67b342d306..426a6ba661 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -29,8 +29,6 @@ AM_CPPFLAGS = \
 # needed
 STANDALONE_CPPFLAGS = -I$(top_srcdir)
 
-WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS)
-
 AM_CFLAGS = \
 	$(WARN_CFLAGS) \
 	$(COVERAGE_CFLAGS) \