diff --git a/.flake8 b/.flake8
index 0617edc4d..8c03ef729 100644
--- a/.flake8
+++ b/.flake8
@@ -33,6 +33,7 @@ exclude = .*,__pycache__,resources.py
 #       (false-positives)
 # D413: Missing blank line after last section (not in pep257?)
 # A003: Builtin name for class attribute (needed for overridden methods)
+# W504: line break after binary operator
 ignore =
     B001,B008,B305,
     E128,E226,E265,E501,E402,E266,E722,E731,
@@ -40,7 +41,8 @@ ignore =
     N802,
     P101,P102,P103,
     D102,D103,D106,D107,D104,D105,D209,D211,D401,D402,D403,D413,
-    A003
+    A003,
+    W504
 min-version = 3.4.0
 max-complexity = 12
 per-file-ignores =
diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 2612e49a6..cd1fcba4d 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -3,7 +3,7 @@
 attrs==18.2.0
 flake8==3.6.0
 flake8-bugbear==18.8.0
-flake8-builtins==1.4.1  # rq.filter: != 1.4.0
+flake8-builtins==1.4.1
 flake8-comprehensions==1.4.1
 flake8-copyright==0.2.2
 flake8-debugger==3.1.0
@@ -19,7 +19,7 @@ flake8-tuple==0.2.13
 mccabe==0.6.1
 pathmatch==0.2.1
 pep8-naming==0.7.0
-pycodestyle==2.3.1  # rq.filter: < 2.4.0
+pycodestyle==2.4.0
 pydocstyle==3.0.0
 pyflakes==2.0.0
 six==1.11.0
diff --git a/misc/requirements/requirements-flake8.txt-raw b/misc/requirements/requirements-flake8.txt-raw
index 7ccbbce26..1f30b83ae 100644
--- a/misc/requirements/requirements-flake8.txt-raw
+++ b/misc/requirements/requirements-flake8.txt-raw
@@ -1,6 +1,6 @@
 flake8
 flake8-bugbear
-flake8-builtins!=1.4.0
+flake8-builtins
 flake8-comprehensions
 flake8-copyright
 flake8-debugger
@@ -15,9 +15,3 @@ flake8-tuple
 pep8-naming
 pydocstyle
 pyflakes
-
-# https://github.com/PyCQA/pycodestyle/issues/741
-#@ filter: pycodestyle < 2.4.0
-
-# https://github.com/gforcada/flake8-builtins/issues/36
-#@ filter: flake8-builtins != 1.4.0