diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index e232c4a1..80d018c4 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -199,10 +199,10 @@ ifdef GCC46
  WFLAGS+=-Wno-error=suggest-attribute=noreturn
 endif
 ifdef GCC54
- WFLAGS+=-Wno-error=logical-op
+ WFLAGS+=-Wno-logical-op -Wno-error=logical-op
 endif
 ifdef GCC61
- WFLAGS+=-Wno-error=tautological-compare
+ WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare
 endif