diff --git a/docs/source/user/error-codes.rst b/docs/source/user/error-codes.rst
index f14c4ec..89183fa 100644
--- a/docs/source/user/error-codes.rst
+++ b/docs/source/user/error-codes.rst
@@ -54,6 +54,9 @@ generates its own :term:`error code`\ s for ``pyflakes``:
 +------+---------------------------------------------------------------------+
 | F707 | an ``except:`` block as not the last exception handler              |
 +------+---------------------------------------------------------------------+
+| F721 | doctest syntax error                                                |
+| F722 | syntax error in forward type annotation                             |
++------+---------------------------------------------------------------------+
 +------+---------------------------------------------------------------------+
 | F811 | redefinition of unused ``name`` from line ``N``                     |
 +------+---------------------------------------------------------------------+
@@ -69,6 +72,9 @@ generates its own :term:`error code`\ s for ``pyflakes``:
 +------+---------------------------------------------------------------------+
 | F841 | local variable ``name`` is assigned to but never used               |
 +------+---------------------------------------------------------------------+
++------+---------------------------------------------------------------------+
+| F901 | ``raise NotImplemented`` should be ``raise NotImplementedError``    |
++------+---------------------------------------------------------------------+
 
 Note that some of these entries behave differently on Python 2 and Python 3,
 for example F812 is specific to Python 2 only.
diff --git a/setup.cfg b/setup.cfg
index 2d48e18..ac876f0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,6 +13,6 @@ license_file = LICENSE
 requires-dist =
     enum34; python_version<"3.4"
     configparser; python_version<"3.2"
-    pyflakes >= 1.5.0, < 1.7.0
+    pyflakes >= 2.0.0, < 2.1.0
     pycodestyle >= 2.4.0, < 2.5.0
     mccabe >= 0.6.0, < 0.7.0
diff --git a/setup.py b/setup.py
index 33833c3..28308bc 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,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 >= 1.5.0, < 1.7.0",
+    "pyflakes >= 2.0.0, < 2.1.0",
     "pycodestyle >= 2.4.0, < 2.5.0",
     "mccabe >= 0.6.0, < 0.7.0",
     "setuptools >= 30",
diff --git a/src/flake8/plugins/pyflakes.py b/src/flake8/plugins/pyflakes.py
index bc19291..9ef9e93 100644
--- a/src/flake8/plugins/pyflakes.py
+++ b/src/flake8/plugins/pyflakes.py
@@ -38,6 +38,7 @@ FLAKE8_PYFLAKES_CODES = {
     'ReturnOutsideFunction': 'F706',
     'DefaultExceptNotLast': 'F707',
     'DoctestSyntaxError': 'F721',
+    'ForwardAnnotationSyntaxError': 'F722',
     'RedefinedWhileUnused': 'F811',
     'RedefinedInListComp': 'F812',
     'UndefinedName': 'F821',
@@ -45,6 +46,7 @@ FLAKE8_PYFLAKES_CODES = {
     'UndefinedLocal': 'F823',
     'DuplicateArgument': 'F831',
     'UnusedVariable': 'F841',
+    'RaiseNotImplemented': 'F901',
 }