diff --git a/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch b/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch
new file mode 100644
index 00000000000..d75d8e7bd0a
--- /dev/null
+++ b/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch
@@ -0,0 +1,22 @@
+diff -r ad8325924f04 pytest.ini
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/pytest.ini	Fri Sep 30 12:28:39 2016 +0200
+@@ -0,0 +1,4 @@
++[pytest]
++-norecursedirs = .git .* *.egg* old docs dist build
++-addopts = -rwv
++
+diff -r ad8325924f04 setup.cfg
+--- a/setup.cfg	Fri Sep 30 09:22:39 2016 +0200
++++ b/setup.cfg	Fri Sep 30 12:28:39 2016 +0200
+@@ -12,10 +12,6 @@
+ 	pycodestyle >= 2.0.0, < 2.1.0
+ 	mccabe >= 0.5.0, < 0.6.0
+ 
+-[pytest]
+-norecursedirs = .git .* *.egg* old docs dist build
+-addopts = -rw
+-
+ [egg_info]
+ tag_build = 
+ tag_date = 0
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 641127ca40b..16076d8f562 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10557,6 +10557,35 @@ in modules // {
     };
   };
 
+  flake8_3 = buildPythonPackage rec {
+    name = "flake8-${version}";
+    version = "3.0.4";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/f/flake8/${name}.tar.gz";
+      sha256 = "03cpdrjxh0fyi2qpdxbbrmxw7whiq3xr3p958gr6yzghk34i1hml";
+    };
+
+    buildInputs = with self; [ nose mock pytestrunner pytest ];
+    propagatedBuildInputs = with self; [ pyflakes mccabe enum34 configparser pycodestyle ];
+
+    patches = [
+      ../development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch
+    ];
+
+    # Tests fail due to missing ini file.
+    preCheck = ''
+      touch tox.ini
+    '';
+
+    meta = {
+      description = "Code checking using pep8 and pyflakes";
+      homepage = http://pypi.python.org/pypi/flake8;
+      license = licenses.mit;
+      maintainers = with maintainers; [ ];
+    };
+  };
+
   flaky = buildPythonPackage rec {
     name = "flaky-${version}";
     version = "3.1.0";