diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f58fcfba5..07c848839 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -23,6 +23,7 @@
   * bump HAP-python-2.9.2
   * bump adb-shell-0.2.0
   * update androidtv-0.0.45
+  * bump SmartHab-0.21
 
 2020-06-29
   * bump aioguardian-1.0.0
diff --git a/dev-python/SmartHab/Manifest b/dev-python/SmartHab/Manifest
index bf0e8fdea..e63a8ba0b 100644
--- a/dev-python/SmartHab/Manifest
+++ b/dev-python/SmartHab/Manifest
@@ -1,3 +1,5 @@
 DIST SmartHab-0.20.tar.gz 6424 BLAKE2B e10ee71770c01e2ea96553026c61fed03643646c3661447f37f24af3881175c8acedf59ccee4297d67d01e1c6d174c84a345244d05b7c309068b14b1ab5294ea SHA512 585ae40769867055319d6eb6c371b7c44c0179bb814b95c81a639edeb6257161f793167279cc4d9a685f2bb41bbe257ea13c8ad76f074d9b65c928cb8c8b756c
+DIST SmartHab-0.21.tar.gz 7185 BLAKE2B b2fa2c821339a52dbf36c91e95f99d3d07c98c08d380ea1f957939a59f0aef4fbdd2e231f1dc661484ab846860a464cc49f69b23f065287a27ffab77986955f0 SHA512 986e830ad177896a4e752a87fb415badecb59589d250e7d626e5d8d5d4e07f647d530dbdc5a909005332785414e23ef7d829fc1b3cba29c6633f69341a533b8c
 EBUILD SmartHab-0.20.ebuild 753 BLAKE2B eb9dcac81c09cd15baf2dbc42d8f63be21abaad012a73a376b59600a5629b01706e7a88f72de290946bb16c8024a0df17b19eb930cecd9ccf439779194d84862 SHA512 ea931cd82193f422b37d877b6f86066d608a33d5e7cf91c03b427bf26b1cb7c33ccca9e64748d2f45122551090378a84ff5385d96f90a8becfd23fe4e4f1e7e8
+EBUILD SmartHab-0.21.ebuild 753 BLAKE2B eb9dcac81c09cd15baf2dbc42d8f63be21abaad012a73a376b59600a5629b01706e7a88f72de290946bb16c8024a0df17b19eb930cecd9ccf439779194d84862 SHA512 ea931cd82193f422b37d877b6f86066d608a33d5e7cf91c03b427bf26b1cb7c33ccca9e64748d2f45122551090378a84ff5385d96f90a8becfd23fe4e4f1e7e8
 MISC metadata.xml 457 BLAKE2B daa514f363d80f8110bae15f07e6da98c50f700b6c9b3285bd38293e4b08b4b1636f8551d7a05cfe3046d133b3cdea88f92cc40fdbc7ea9fb4c70df9bc1d9d0d SHA512 05ad7ce74a90344a9b9a944cff666c450a57fb13ccfec899894a2e2bdb4e78ff5900893c3e191ca25a3a84b65c9b6da7cb3180733179161e203654c1ee38ed83
diff --git a/dev-python/SmartHab/SmartHab-0.21.ebuild b/dev-python/SmartHab/SmartHab-0.21.ebuild
new file mode 100644
index 000000000..8c90ee775
--- /dev/null
+++ b/dev-python/SmartHab/SmartHab-0.21.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="This package allows controlling devices in a SmartHab-powered home."
+HOMEPAGE="https://gitlab.com/outadoc/python-smarthab/ https://pypi.org/project/SmartHab/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/requests[${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
+}