diff --git a/setup.cfg b/setup.cfg
index 913880415..a40d74964 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,8 +5,8 @@ logging-clear-handlers=1
 [flake8]
 min-version=2.7
 accept-encodings=utf-8
-# Default pyflakes errors we ignore:
-# - E241: missing whitespace after ',' (used to align visually)
+# Errors we ignore:
+# - E121,E123,E126,E226,E24,E704,W503,W504 flake8 default ignores (have to be listed here to not be overridden)
 # - E221: multiple spaces before operator (used to align visually)
 # - E731: do not assign a lambda expression, use a def
 # - F405 object may be undefined, or defined from star imports
@@ -19,4 +19,4 @@ accept-encodings=utf-8
 # - FI53: `__future__` import "print_function" present
 # - FI14: `__future__` import "unicode_literals" missing
 # - FI15: `__future__` import "generator_stop" missing
-ignore=E305,C901,E241,E221,E731,F405,FI50,FI51,FI12,FI53,FI14,FI15
+ignore=E121,E123,E126,E226,E24,E704,W503,W504,E305,C901,E221,E731,F405,FI50,FI51,FI12,FI53,FI14,FI15