diff --git a/srcpkgs/flake8/patches/pycodestyle-2.4.patch b/srcpkgs/flake8/patches/pycodestyle-2.4.patch
deleted file mode 100644
index 70c6d3055bc..00000000000
--- a/srcpkgs/flake8/patches/pycodestyle-2.4.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://gitlab.com/pycqa/flake8/merge_requests/230
-https://gitlab.com/pycqa/flake8/merge_requests/231
-
---- setup.cfg.orig
-+++ setup.cfg
-@@ -9,7 +9,7 @@
- 	enum34; python_version<"3.4"
- 	configparser; python_version<"3.2"
- 	pyflakes >= 1.5.0, < 1.7.0
--	pycodestyle >= 2.0.0, < 2.4.0
-+	pycodestyle >= 2.4.0, < 2.5.0
- 	mccabe >= 0.6.0, < 0.7.0
- 
- [egg_info]
---- setup.py.orig
-+++ setup.py
-@@ -22,7 +22,7 @@
-     # 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",
--    "pycodestyle >= 2.0.0, < 2.4.0",
-+    "pycodestyle >= 2.4.0, < 2.5.0",
-     "mccabe >= 0.6.0, < 0.7.0",
-     "setuptools >= 30",
- ]
-@@ -108,7 +108,8 @@
-             PEP8_PLUGIN('module_imports_on_top_of_file'),
-             PEP8_PLUGIN('compound_statements'),
-             PEP8_PLUGIN('explicit_line_join'),
--            PEP8_PLUGIN('break_around_binary_operator'),
-+            PEP8_PLUGIN('break_after_binary_operator'),
-+            PEP8_PLUGIN('break_before_binary_operator'),
-             PEP8_PLUGIN('comparison_to_singleton'),
-             PEP8_PLUGIN('comparison_negative'),
-             PEP8_PLUGIN('comparison_type'),
-@@ -118,6 +119,8 @@
-             PEP8_PLUGIN('python_3000_raise_comma'),
-             PEP8_PLUGIN('python_3000_not_equal'),
-             PEP8_PLUGIN('python_3000_backticks'),
-+            PEP8_PLUGIN('python_3000_invalid_escape_sequence'),
-+            PEP8_PLUGIN('python_3000_async_await_keywords'),
-         ],
-         'flake8.report': [
-             'default = flake8.formatting.default:Default',
---- tox.ini.orig
-+++ tox.ini
-@@ -141,7 +141,7 @@
- # defaults to selecting all other errors so we do not need select=E,F,W,I,D
- # Once Flake8 3.0 is released and in a good state, we can use both and it will
- # work well \o/
--ignore = D203
-+ignore = D203, W504
- exclude =
-     .tox,
-     .git,
diff --git a/srcpkgs/flake8/template b/srcpkgs/flake8/template
index 96ea38272a4..f640b9ec9e2 100644
--- a/srcpkgs/flake8/template
+++ b/srcpkgs/flake8/template
@@ -1,40 +1,29 @@
 # Template file for 'flake8'
 pkgname=flake8
-version=3.5.0
-revision=2
+version=3.6.0
+revision=1
 noarch=yes
-build_style=python-module
+build_style=python3-module
 pycompile_module="flake8"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-pycodestyle python-pyflakes python-mccabe
- python-enum34 python-backports.configparser"
-short_desc="The modular source code checker: pycodestyle, pyflakes, mccabe (Python2)"
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-pycodestyle python3-pyflakes python3-mccabe"
+short_desc="The modular source code checker: pycodestyle, pyflakes, mccabe"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="https://gitlab.com/pycqa/flake8"
 license="MIT"
 distfiles="${PYPI_SITE}/f/flake8/flake8-${version}.tar.gz"
-checksum=7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0
-alternatives="flake8:flake8:/usr/bin/python2-flake8"
+checksum=6a35f5b8761f45c5513e3405f110a86bea57982c3b75b766ce7b65217abe1670
 
 pre_build() {
 	sed -i '/setup_requires/d' setup.py
 }
 post_install() {
 	vlicense LICENSE
-	# XXX: override the default naming scheme
-	cp -a ${DESTDIR}/usr/bin/{,python3-}flake8
-	mv ${DESTDIR}/usr/bin/{,python2-}flake8
 }
 
 python3-flake8_package() {
 	noarch=yes
-	pycompile_module="flake8"
-	depends="python3-setuptools python3-pycodestyle python3-pyflakes python3-mccabe"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="flake8:flake8:/usr/bin/python3-flake8"
-	pkg_install() {
-		vmove usr/bin/python3-flake8
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="flake8>=${version}_${revision}"
 }