diff --git a/pyflakes21.patch b/pyflakes21.patch
new file mode 100644
index 0000000..dea8a0d
--- /dev/null
+++ b/pyflakes21.patch
@@ -0,0 +1,65 @@
+From 03ea38df168036a38aff7af916c07c05fe1f2eb2 Mon Sep 17 00:00:00 2001
+From: Anthony Sottile <asottile@umich.edu>
+Date: Sat, 19 Jan 2019 11:59:38 -0800
+Subject: [PATCH] WIP: use latest pyflakes
+
+---
+ setup.py                       |  2 +-
+ src/flake8/plugins/pyflakes.py | 10 ++++++++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+Index: flake8-3.6.0/setup.py
+===================================================================
+--- flake8-3.6.0.orig/setup.py
++++ flake8-3.6.0/setup.py
+@@ -25,7 +25,7 @@ requires = [
+     # http://flake8.pycqa.org/en/latest/faq.html#why-does-flake8-use-ranges-for-its-dependencies
+     # And in which releases we will update those ranges here:
+     # http://flake8.pycqa.org/en/latest/internal/releases.html#releasing-flake8
+-    "pyflakes >= 2.0.0, < 2.1.0",
++    "pyflakes >= 2.1.0, < 2.2.0",
+     "pycodestyle >= 2.4.0, < 2.5.0",
+     "mccabe >= 0.6.0, < 0.7.0",
+     "setuptools >= 30",
+Index: flake8-3.6.0/src/flake8/plugins/pyflakes.py
+===================================================================
+--- flake8-3.6.0.orig/src/flake8/plugins/pyflakes.py
++++ flake8-3.6.0/src/flake8/plugins/pyflakes.py
+@@ -30,6 +30,8 @@ FLAKE8_PYFLAKES_CODES = {
+     "TooManyExpressionsInStarredAssignment": "F621",
+     "TwoStarredExpressions": "F622",
+     "AssertTuple": "F631",
++    "IsLiteral": "F632",
++    "InvalidPrintSyntax": "F633",
+     "BreakOutsideLoop": "F701",
+     "ContinueOutsideLoop": "F702",
+     "ContinueInFinally": "F703",
+@@ -39,6 +41,7 @@ FLAKE8_PYFLAKES_CODES = {
+     "DefaultExceptNotLast": "F707",
+     "DoctestSyntaxError": "F721",
+     "ForwardAnnotationSyntaxError": "F722",
++    "CommentAnnotationSyntaxError": "F723",
+     "RedefinedWhileUnused": "F811",
+     "RedefinedInListComp": "F812",
+     "UndefinedName": "F821",
+@@ -72,7 +75,7 @@ class FlakesChecker(pyflakes.checker.Che
+     include_in_doctest = []
+     exclude_from_doctest = []
+ 
+-    def __init__(self, tree, filename):
++    def __init__(self, tree, file_tokens, filename):
+         """Initialize the PyFlakes plugin with an AST tree and filename."""
+         filename = utils.normalize_paths(filename)[0]
+         with_doctest = self.with_doctest
+@@ -97,7 +100,10 @@ class FlakesChecker(pyflakes.checker.Che
+                     with_doctest = True
+ 
+         super(FlakesChecker, self).__init__(
+-            tree, filename, withDoctest=with_doctest
++            tree,
++            filename=filename,
++            withDoctest=with_doctest,
++            file_tokens=file_tokens,
+         )
+ 
+     @classmethod
diff --git a/python-flake8.changes b/python-flake8.changes
index b81a031..75ad8ac 100644
--- a/python-flake8.changes
+++ b/python-flake8.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 29 09:19:47 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Add patch to build with pyflakes-2.1.0:
+  * pyflakes21.patch
+
 -------------------------------------------------------------------
 Thu Nov  1 22:46:04 UTC 2018 - Arun Persaud <arun@gmx.de>
 
diff --git a/python-flake8.spec b/python-flake8.spec
index 941dcb0..3ac1248 100644
--- a/python-flake8.spec
+++ b/python-flake8.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-flake8
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,6 +27,7 @@ Group:          Development/Languages/Python
 URL:            https://gitlab.com/pycqa/flake8
 Source:         https://files.pythonhosted.org/packages/source/f/flake8/flake8-%{version}.tar.gz
 Patch0:         remove_mock_dependency.patch
+Patch1:         pyflakes21.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros