diff --git a/dev-python/flake8/flake8-2.2.5.ebuild b/dev-python/flake8/flake8-2.2.5.ebuild
index ea34fb3f3f0b4..ccd6c382c7155 100644
--- a/dev-python/flake8/flake8-2.2.5.ebuild
+++ b/dev-python/flake8/flake8-2.2.5.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8/flake8-2.4.1-r1.ebuild b/dev-python/flake8/flake8-2.4.1-r1.ebuild
index a793fc4e2acd1..1a39fa0dd7875 100644
--- a/dev-python/flake8/flake8-2.4.1-r1.ebuild
+++ b/dev-python/flake8/flake8-2.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8/flake8-2.5.0.ebuild b/dev-python/flake8/flake8-2.5.0.ebuild
index f2f8dd77d34ae..71150799f2043 100644
--- a/dev-python/flake8/flake8-2.5.0.ebuild
+++ b/dev-python/flake8/flake8-2.5.0.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8/flake8-2.5.1.ebuild b/dev-python/flake8/flake8-2.5.1.ebuild
index 94aa90085815b..bc1e09567c59a 100644
--- a/dev-python/flake8/flake8-2.5.1.ebuild
+++ b/dev-python/flake8/flake8-2.5.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8/flake8-2.5.4.ebuild b/dev-python/flake8/flake8-2.5.4.ebuild
index 66e3dff4f6492..73e951eb85c51 100644
--- a/dev-python/flake8/flake8-2.5.4.ebuild
+++ b/dev-python/flake8/flake8-2.5.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8/flake8-3.0.4-r2.ebuild b/dev-python/flake8/flake8-3.0.4-r2.ebuild
index 8c9f7b10e0fbf..d1495812cfa27 100644
--- a/dev-python/flake8/flake8-3.0.4-r2.ebuild
+++ b/dev-python/flake8/flake8-3.0.4-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8/flake8-3.2.1.ebuild b/dev-python/flake8/flake8-3.2.1.ebuild
index 2ef4e59cd1a2b..520728c1d3ae5 100644
--- a/dev-python/flake8/flake8-3.2.1.ebuild
+++ b/dev-python/flake8/flake8-3.2.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8/flake8-3.3.0.ebuild b/dev-python/flake8/flake8-3.3.0.ebuild
index 5557d870bdc6e..8011a010a7710 100644
--- a/dev-python/flake8/flake8-3.3.0.ebuild
+++ b/dev-python/flake8/flake8-3.3.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 
 inherit distutils-r1