diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index 781076aa2..a891a7551 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -193,8 +193,11 @@ endif
 ifdef GCC46
  WFLAGS+=-Wno-error=suggest-attribute=noreturn
 endif
-ifdef GCC62
- WFALGS+=-Wno-tautological-compare
+ifdef GCC54
+ WFALGS+=-Wno-error=logical-op
+endif
+ifdef GCC61
+ WFALGS+=-Wno-error=tautological-compare
 endif
 WFLAGS+=$(OLDWFLAGS)