diff --git a/dev-python/zha-quirks/Manifest b/dev-python/zha-quirks/Manifest
index ef754f2d5..626672bd4 100644
--- a/dev-python/zha-quirks/Manifest
+++ b/dev-python/zha-quirks/Manifest
@@ -3,9 +3,11 @@ DIST zha-quirks-0.0.54.tar.gz 108850 BLAKE2B bf275d7ccb51e6052356b88b6ae75419263
 DIST zha-quirks-0.0.55.tar.gz 111655 BLAKE2B 6f77ed150afb41b98a44b310abb2bf6362b03c8d00c2622f88ee25d6177afd5db718ac2088de1f7dfb7ecd5dc519548282e2b0d5b5a9160d8ce2446b5d9ba9b5 SHA512 ed3eac9e00b7285b09e3885e0a92d426fc8d2edc2e9b83c48be558f146dafcdc654f762aed1275a8a93015edc97235d3ecdde504359b5dc89cadf14acec529c3
 DIST zha-quirks-0.0.56.tar.gz 111634 BLAKE2B 0fc13d36dd7998468aaefa189118e4c37cb4efdc256c7b8e2a2cadb934b3fcd874efd4be66700c3694a989e0defd855e9c9af16773ab7e16ac09033b35106557 SHA512 9e891a8cc3d2b1aaf5e2f509e3577fa5432266b3cd354e092acfcd68fab76d5c9b22ffbe12d57fa4ef9d3755d575c7397ff053d12f284fd151d175482e968442
 DIST zha-quirks-0.0.57.tar.gz 115317 BLAKE2B 0f3704cd9aa1f6c1d961096e9019bba49865707e5c81ef879fb874560ca74727f43fade643e835fdbddbf7e05599845c907cb794d780aefbbd5198e4c5948a81 SHA512 c2f4d3013c08c55fa5508132946537aa0e5e6251bcbc5944dc59a68154c54ee4741eb4472ec1a0827faac12735e438ca07b50f2c3f8bd13ae7115fde2f309d62
+DIST zha-quirks-0.0.58.tar.gz 123175 BLAKE2B 606401b88c49559969e68c48dc6fa9252e3b035900216484813d949cb8e35e4d34fd22d5fc9ea2275759ad64131cd4bd6a5fb4bd32371da980098c17ac1d0bce SHA512 0a376361428de85d480b748b34dc831aa45752b3a7fa3cb11b45009f4fa50982ec6b906ad5d649284ef90de8472d5014b533f9dcab7dc65cbab49c0a184de1e9
 EBUILD zha-quirks-0.0.53.ebuild 775 BLAKE2B 034358291f6b625f35d9e921a56d7ab73a81b6d5d835d0d88b7d9cc73aa3d07c34bd66947a5306cc5f11a9caf8659dffb6e7afcfa20bd27adb8695aaff173648 SHA512 967395f82da6649060e2c5f7834f23f11d7ab9efcbb1de290188cdfa7c7d21be4cda6b69db1fbc864565843168914713a094e7ad81f02b72ffec35317c06bda8
 EBUILD zha-quirks-0.0.54.ebuild 775 BLAKE2B 034358291f6b625f35d9e921a56d7ab73a81b6d5d835d0d88b7d9cc73aa3d07c34bd66947a5306cc5f11a9caf8659dffb6e7afcfa20bd27adb8695aaff173648 SHA512 967395f82da6649060e2c5f7834f23f11d7ab9efcbb1de290188cdfa7c7d21be4cda6b69db1fbc864565843168914713a094e7ad81f02b72ffec35317c06bda8
 EBUILD zha-quirks-0.0.55.ebuild 775 BLAKE2B 034358291f6b625f35d9e921a56d7ab73a81b6d5d835d0d88b7d9cc73aa3d07c34bd66947a5306cc5f11a9caf8659dffb6e7afcfa20bd27adb8695aaff173648 SHA512 967395f82da6649060e2c5f7834f23f11d7ab9efcbb1de290188cdfa7c7d21be4cda6b69db1fbc864565843168914713a094e7ad81f02b72ffec35317c06bda8
 EBUILD zha-quirks-0.0.56.ebuild 775 BLAKE2B 034358291f6b625f35d9e921a56d7ab73a81b6d5d835d0d88b7d9cc73aa3d07c34bd66947a5306cc5f11a9caf8659dffb6e7afcfa20bd27adb8695aaff173648 SHA512 967395f82da6649060e2c5f7834f23f11d7ab9efcbb1de290188cdfa7c7d21be4cda6b69db1fbc864565843168914713a094e7ad81f02b72ffec35317c06bda8
 EBUILD zha-quirks-0.0.57.ebuild 775 BLAKE2B 034358291f6b625f35d9e921a56d7ab73a81b6d5d835d0d88b7d9cc73aa3d07c34bd66947a5306cc5f11a9caf8659dffb6e7afcfa20bd27adb8695aaff173648 SHA512 967395f82da6649060e2c5f7834f23f11d7ab9efcbb1de290188cdfa7c7d21be4cda6b69db1fbc864565843168914713a094e7ad81f02b72ffec35317c06bda8
+EBUILD zha-quirks-0.0.58.ebuild 776 BLAKE2B 7c8caca0b1e48479c40090dc50f219464ecd6c55d4c0678655b3e6d1da37f7963331ae98debefe1dfcdaa04838c55b45bbc2b9a9c3b42991dc2a1168d213051b SHA512 9655638540422cc9354427fddd5faa109b8c63532d02e91d53657cf4dc7ce40802d326e28c6e691225d5e31f77ea46046828a0d60f4b1cad4c30c91455bc5b39
 MISC metadata.xml 465 BLAKE2B 4ab6f1bf46ff45a48e3d7548f071780124cfe64eeb3cbfd180677ad409d271387cc2cfe3795be9f9c9057e7f2105082f370d3f0d1eb055f7bff542980a2fe1eb SHA512 210d99ebc5972c1253efda162f95fa1e62b0f8ffcc5432bae8dd2a15a65652c9e5d9104959c64ddaed286faf636c326c56bac1e1c349ed22a3fd4bafd00c2056
diff --git a/dev-python/zha-quirks/zha-quirks-0.0.58.ebuild b/dev-python/zha-quirks/zha-quirks-0.0.58.ebuild
new file mode 100644
index 000000000..c358035ad
--- /dev/null
+++ b/dev-python/zha-quirks/zha-quirks-0.0.58.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library implementing Zigpy quirks for ZHA in Home Assistant"
+HOMEPAGE="https://github.com/dmulcahey/zha-device-handlers https://pypi.org/project/zha-quirks/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DOCS="README.md"
+
+RDEPEND=">=dev-python/zigpy-0.32.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+	py.test -v -v || die
+}