diff --git a/docs/warnings.rst b/docs/warnings.rst
index b4b7fb1..d9a729f 100644
--- a/docs/warnings.rst
+++ b/docs/warnings.rst
@@ -34,6 +34,8 @@ PyFlakes messages to add the following codes:
 +------+--------------------------------------------------------------------+
 | F404 | future import(s) ``name`` after other statements                   |
 +------+--------------------------------------------------------------------+
+| F405 | ``name`` may be undefined, or defined from star imports: ``module``|
++------+--------------------------------------------------------------------+
 +------+--------------------------------------------------------------------+
 | F811 | redefinition of unused ``name`` from line ``N``                    |
 +------+--------------------------------------------------------------------+
diff --git a/flake8/_pyflakes.py b/flake8/_pyflakes.py
index 976b2ab..472c3b9 100644
--- a/flake8/_pyflakes.py
+++ b/flake8/_pyflakes.py
@@ -20,6 +20,7 @@ def patch_pyflakes():
         'F402 ImportShadowedByLoopVar',
         'F403 ImportStarUsed',
         'F404 LateFutureImport',
+        'F405 ImportStarUsage',
         'F810 Redefined',               # XXX Obsolete?
         'F811 RedefinedWhileUnused',
         'F812 RedefinedInListComp',
diff --git a/flake8/tests/test_util.py b/flake8/tests/test_util.py
index bfbc660..221a98e 100644
--- a/flake8/tests/test_util.py
+++ b/flake8/tests/test_util.py
@@ -79,19 +79,19 @@ class TestOptionSerializerParsesLists(unittest.TestCase):
     def setUp(self):
         self.option = optparse.Option('--select')
         self.option_name = 'select'
-        self.answer = ['F401', 'F402', 'F403', 'F404']
+        self.answer = ['F401', 'F402', 'F403', 'F404', 'F405']
 
     def test_parses_simple_comma_separated_lists(self):
-        value = option_normalizer('F401,F402,F403,F404', self.option,
+        value = option_normalizer('F401,F402,F403,F404,F405', self.option,
                                   self.option_name)
         self.assertEqual(value, self.answer)
 
     def test_parses_less_simple_comma_separated_lists(self):
-        value = option_normalizer('F401 ,F402 ,F403 ,F404', self.option,
+        value = option_normalizer('F401 ,F402 ,F403 ,F404, F405', self.option,
                                   self.option_name)
         self.assertEqual(value, self.answer)
 
-        value = option_normalizer('F401, F402, F403, F404', self.option,
+        value = option_normalizer('F401, F402, F403, F404, F405', self.option,
                                   self.option_name)
         self.assertEqual(value, self.answer)
 
@@ -101,6 +101,7 @@ class TestOptionSerializerParsesLists(unittest.TestCase):
             F402,
             F403,
             F404,
+            F405,
         ''', self.option, self.option_name)
         self.assertEqual(value, self.answer)