diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c2a4aabe4..fad3dd1d4 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -9,6 +9,7 @@
   * add pysml-0.0.2
   * bump pyvizio-0.1.35
   * bump youtube_dl-2020.3.6
+  * bump zha-quirks-0.0.35
 
 2020-03-04 homeassistant-0.106.5
   * bump PyFlume-0.3.0
diff --git a/dev-python/zha-quirks/Manifest b/dev-python/zha-quirks/Manifest
index fc9074281..9ce23c6e0 100644
--- a/dev-python/zha-quirks/Manifest
+++ b/dev-python/zha-quirks/Manifest
@@ -7,6 +7,7 @@ DIST zha-quirks-0.0.31.tar.gz 42270 BLAKE2B 09962e352012afea1771e1a335402f2beb76
 DIST zha-quirks-0.0.32.tar.gz 43719 BLAKE2B 38eef3624914536852bba48a96c671b0eb4f10e49269e0664122158a32c0728e135cb7ff390ba6980c07608f3f722d4f06f930ca01a1eba0f6895883fc851e8f SHA512 09c9a0b656e4d74a51f79ccdc1ffd49aebadb22abe6dc376368a6482cfbea158f94405f260d007e52ffd7cc0dfcbf1494b11db931b28d3a6e649fd30e6c50389
 DIST zha-quirks-0.0.33.tar.gz 45620 BLAKE2B 1e26b019db040010b91ecb554a79299832e0bcaa0731e3dc8826035e31fbe4d0d82c4af52db272aea6229431f3b4213b267322f42c5a6a1ce4fe5051abeaa294 SHA512 1e3041ff2f72f394bd6a03ca4c177cd90291ccafbc2761eeba3b0bca7669f15c21853fd37526adec336b11446c2bee1de89ff5a69e99f0438ac6687d1edcec21
 DIST zha-quirks-0.0.34.tar.gz 46868 BLAKE2B 1cd5c6bc02b12ba65ede422e144deb16fc22f6830f26db4c66d58c10a0347affe7834f8520345d526f79897ab0b2eddd57d5830c21538bc9c49eda03a652aa5e SHA512 36ae523103c0d7c64273c215cc15715c8e7c43afb9a0517fa9c5e0a46658388e7fdff1be0677cd47874ff8fbe952e1262f5fa1f5e10429319a5d23e6556c25ad
+DIST zha-quirks-0.0.35.tar.gz 47263 BLAKE2B 41693f93e64b55923dafa5fe17f907734e04ce6417a8847dc958ee19fa71569e89791ca9b1d1623898d8c2bbcd70dcebd1239ea041cf57b54edc2d931eacb99d SHA512 fdf9b4826289017d57cd711a241d33be6e821e225dbce4faebbd1037f7db76acf48df87fba5766377051ed8779ffd7638616cbafa329dd06dbb34f31a8f23ced
 EBUILD zha-quirks-0.0.25.ebuild 769 BLAKE2B b4a69c69ee01531870f9741c44d7e322dde6d7d55d662fe927e27477abd24d3aeebb4c7cc177c05d8de162ed111c781acdd926b02ec5d761aff331839c2bae10 SHA512 69d792c0c2a2615431048d48e9bf960649c3e7010dca761c64638cfcda9a1ce5165b625dff5a9f5b811244b1a8741bf4e6d8af0c9eb528f932dd707eb9ac13bb
 EBUILD zha-quirks-0.0.26.ebuild 769 BLAKE2B b4a69c69ee01531870f9741c44d7e322dde6d7d55d662fe927e27477abd24d3aeebb4c7cc177c05d8de162ed111c781acdd926b02ec5d761aff331839c2bae10 SHA512 69d792c0c2a2615431048d48e9bf960649c3e7010dca761c64638cfcda9a1ce5165b625dff5a9f5b811244b1a8741bf4e6d8af0c9eb528f932dd707eb9ac13bb
 EBUILD zha-quirks-0.0.27-r1.ebuild 767 BLAKE2B 97859b0493f6a0fd4d6852bd19e95d5c98e43e2f056b63f2b6e9a3e847230d4862552607ae0f9161f5c3f703830cbb8c852e48a2f4e66345f8f5eeeacc157d87 SHA512 18877a91dad9131ff83edfd9eae02db1ffd11c91a94ee0d8f5c06ca27e63d2d8f6f8b62109ebe45d26ff4fed27ca5a68fe41166d018c90de19fa974c6cfcf5b7
@@ -16,4 +17,5 @@ EBUILD zha-quirks-0.0.31.ebuild 767 BLAKE2B 97859b0493f6a0fd4d6852bd19e95d5c98e4
 EBUILD zha-quirks-0.0.32.ebuild 776 BLAKE2B 20f5b62c674fb6a0e16e60402f35611289fe4e383601993b52b6435764414968f769b1da2bacf56312879ab5969ee849d9e8de251ca00f2834691eedc245b558 SHA512 48cef5121f52b730e3903bae611bd5b6454b519b0d55420389c67f25e48bb754b2199d322262d02b0db3fc0b290136f65e026a993694a4c16bb39406ca3abf5f
 EBUILD zha-quirks-0.0.33.ebuild 776 BLAKE2B 20f5b62c674fb6a0e16e60402f35611289fe4e383601993b52b6435764414968f769b1da2bacf56312879ab5969ee849d9e8de251ca00f2834691eedc245b558 SHA512 48cef5121f52b730e3903bae611bd5b6454b519b0d55420389c67f25e48bb754b2199d322262d02b0db3fc0b290136f65e026a993694a4c16bb39406ca3abf5f
 EBUILD zha-quirks-0.0.34.ebuild 776 BLAKE2B 20f5b62c674fb6a0e16e60402f35611289fe4e383601993b52b6435764414968f769b1da2bacf56312879ab5969ee849d9e8de251ca00f2834691eedc245b558 SHA512 48cef5121f52b730e3903bae611bd5b6454b519b0d55420389c67f25e48bb754b2199d322262d02b0db3fc0b290136f65e026a993694a4c16bb39406ca3abf5f
+EBUILD zha-quirks-0.0.35.ebuild 776 BLAKE2B 20f5b62c674fb6a0e16e60402f35611289fe4e383601993b52b6435764414968f769b1da2bacf56312879ab5969ee849d9e8de251ca00f2834691eedc245b558 SHA512 48cef5121f52b730e3903bae611bd5b6454b519b0d55420389c67f25e48bb754b2199d322262d02b0db3fc0b290136f65e026a993694a4c16bb39406ca3abf5f
 MISC metadata.xml 465 BLAKE2B 4ab6f1bf46ff45a48e3d7548f071780124cfe64eeb3cbfd180677ad409d271387cc2cfe3795be9f9c9057e7f2105082f370d3f0d1eb055f7bff542980a2fe1eb SHA512 210d99ebc5972c1253efda162f95fa1e62b0f8ffcc5432bae8dd2a15a65652c9e5d9104959c64ddaed286faf636c326c56bac1e1c349ed22a3fd4bafd00c2056
diff --git a/dev-python/zha-quirks/zha-quirks-0.0.35.ebuild b/dev-python/zha-quirks/zha-quirks-0.0.35.ebuild
new file mode 100644
index 000000000..39aa16be2
--- /dev/null
+++ b/dev-python/zha-quirks/zha-quirks-0.0.35.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+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 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=">=dev-python/zigpy-homeassistant-0.8.0[${PYTHON_USEDEP}]"
+DEPEND="${REDEPEND}
+	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
+}