diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3cc26b589..0aba60044 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,4 @@
-2020-11-21
+2020-11-21 homeassistant-0.118.2
   * bump pymyq-2.0.10
   * update python-awair-0.2.1
   * bump zigpy-zigate-0.7.3
@@ -9,6 +9,7 @@
   * add plugwise-0.8.3
   * update flake8-3.8.4-r1 (cannot be run with test)
   * unpin pylint in aioesphomeapi-2.6.3-r1
+  * re-add (from main repo) pylint-2.5.3, still needed for <=homeassistant-0.118.1
 
 2020-11-19 homeassistant-0.118.1
   * bump home-assistant-frontend-20201111.2
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 18d2200fd..665d00f9f 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,5 +1,8 @@
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
+AUX pylint-2.5.3-no-pytest-runner.patch 533 BLAKE2B 0882d3b057cd214ac04645c3992585e9550624f551206d863817940846fc6bd7d863431c33df46f0a83379fdc3ab411949b73f0475e08fd7debd465d83e848eb SHA512 9ed1784e83693b2aeff1862f9592fa574f20bb2d513f3bdef34b895263a31d6d747b4c76d09e6d48e15031388cd70b01caabfd84628ca98e1634fa42b6988eae
 AUX pylint-2.5.3-tests.patch 455 BLAKE2B 608ec913ea9d8088c3e7303026339eca69cbf706601ccb841642eef83ae9eccb7d6863da6c7957f9f49a81f24d17e72d835c3740ef177ced6356bec7510a0221 SHA512 dd1930e47dc342cb76fe55fad22cde3b4d5935a62c62d740b75e27701606bb8d5513b8f2c9e2f3116c0456a545a2c56f6d75b87903e2cdec1df97e4b8ed1b532
+DIST pylint-2.5.3.tar.gz 684449 BLAKE2B 7b494f5334376ff571fd8971851198d037e87c5be83d0123fcb108701489769785164bb077eb10b4851c89b82dadc40c510186eaf03be1621c4d78c79dffbceb SHA512 03fcd893d361b66794f17433e90df108099fee2eccb35507c7f61befb8db846f0242e5ce2b4ee63727c9cc780a376c3b93d5af3186f884a4fdaad68b224ed7d2
 DIST pylint-2.6.0.tar.gz 680289 BLAKE2B f7d4159478f667a3234beefd148857f26c8f7ea3aae3bfa70fa06fe2a8d86fcf22a0727a9fa5d8fc3de4aa0bb7a4d6e13bf68029f359122762d1e0d24a0b715b SHA512 02881fe14401bbe946618ef947c8db320a6c8dd93626402260d60468538ce67b61d1e8b921bfb1a6020514dd392e9b0021c97ddb60b45866c2d2241224f93f08
+EBUILD pylint-2.5.3.ebuild 1604 BLAKE2B 36455c4999d1e54ea89fea6359b654226ce7ea9df5e21e03c201de7daf7155b886ff6d669bb3e7e09c0aafd3bc5d6d338e9f4a12c5fb3e4b51a727a62ca00e59 SHA512 ca7e95401d063fbae9f2de19fd40fba53b3771ddbe02acfb45e71577d916cf0d76a9c67c83fbd2960603d9e002ff5edfccb2755f0cd3621150a131837b7038b2
 EBUILD pylint-2.6.0.ebuild 1559 BLAKE2B 471f27a0dbcc117c01c2e4c7fa3153f97bf32454bc7a801c248d5e966da2319a5975636c117e3c05082af549c15c691552f8a4768d3787dd9d5a521ffcd73f65 SHA512 62e61f80d4ba078965d7b2dd1f424b0c286393808f41596a4e58a899ccc22c411c7d7e54ef0d8f1df711815b3f557d7fb9bfa26325e464761d15c59a3e764660
 MISC metadata.xml 471 BLAKE2B 752d34ba23d911d1b415210e55183213d9e3f7e39b1ac83f50d5dd45e0ac4b51b5c46870d9a13493c21a5268f0b1ceeb25b875c415e88ffe26cac990762ece69 SHA512 e16bf2ddc8773a018a9f2095075517865091b6b51dd9df4a1a15dc6848798240efc3372d73820a020b7823069abc08b2bd6f5345bda9e49fae68fdf9ac90be26
diff --git a/dev-python/pylint/files/pylint-2.5.3-no-pytest-runner.patch b/dev-python/pylint/files/pylint-2.5.3-no-pytest-runner.patch
new file mode 100644
index 000000000..f4cc6be36
--- /dev/null
+++ b/dev-python/pylint/files/pylint-2.5.3-no-pytest-runner.patch
@@ -0,0 +1,20 @@
+diff --git a/setup.py b/setup.py
+index 92d059ff..cbc5b881 100644
+--- a/setup.py
++++ b/setup.py
+@@ -67,7 +67,6 @@ else:
+ 
+ 
+ needs_pytest = {"pytest", "test", "ptr"}.intersection(sys.argv)
+-pytest_runner = ["pytest-runner"] if needs_pytest else []
+ 
+ 
+ def ensure_scripts(linux_scripts):
+@@ -151,7 +150,6 @@ def install(**kwargs):
+         extras_require=extras_require,
+         test_suite="test",
+         python_requires=">=3.5.*",
+-        setup_requires=pytest_runner,
+         tests_require=["pytest"],
+         **kwargs
+     )
diff --git a/dev-python/pylint/pylint-2.5.3.ebuild b/dev-python/pylint/pylint-2.5.3.ebuild
new file mode 100644
index 000000000..4dec5c52c
--- /dev/null
+++ b/dev-python/pylint/pylint-2.5.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+# entry_points is added via **kwargs in a dict
+_DISTUTILS_SETUPTOOLS_WARNED=1
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/astroid-2.3.3[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	dev-python/mccabe[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/six[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+	"${FILESDIR}/${PN}-2.5.3-no-pytest-runner.patch"
+	"${FILESDIR}/${PN}-2.5.3-tests.patch"
+)
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# we don't want to run the benchmarking tests
+	rm -f tests/benchmark/test_baseline_benchmarks.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	# Optional dependency on "tk" USE flag would break support for Jython.
+	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." 'dev-lang/python[tk]'
+}