diff --git a/app-misc/homeassistant/Manifest b/app-misc/homeassistant/Manifest
index 183ad8b2b..7628eba1b 100644
--- a/app-misc/homeassistant/Manifest
+++ b/app-misc/homeassistant/Manifest
@@ -22,5 +22,5 @@ EBUILD homeassistant-0.89.2.ebuild 7504 BLAKE2B 8247e4a4330b02f55874e75dea07aef1
 EBUILD homeassistant-0.90.0_beta1.ebuild 7505 BLAKE2B 6bc1a8167ac2cc591199032f99ec556e5ecbce7c150674920432cf49d172e472f6893a42241e9147189fb1c649ddf02781cc41e2872568e8d40333d45e44c3c0 SHA512 5b52f9418b3f945e7f06eedcd16bad1e52ebd04bdec551ff1600d8099dd7008409c9cf5fd873acb6b6499bdc3b9d3c8152459f6787ab04f606810670b717edbd
 EBUILD homeassistant-0.90.0_beta2.ebuild 7505 BLAKE2B 733da4d8bd9bca180d3125525581dc78f7276ab90273b49d13d805d24885f9e2095815aef3694e3b389a14f4c1aa0753a0a335e24da145135965d9d0451a4df8 SHA512 ce0aebeb86f17fe9b9a2628a7be5bc6db5b95e7803620c06b39f97602b568c9689453977fa1a6783667ea643b0dfe9ac6e8a8ab6df69a3a5549c5f7486a98926
 EBUILD homeassistant-0.90.0_beta3.ebuild 7505 BLAKE2B 9087ab0926efe07af05ba136057a8af40a7adce437adea57992f67ee082aba0aa6f83423ecc4e7152e386c0e980bde2968c3b0147a8bb1253c1e9f65cd8e080c SHA512 e9e901732f51358ab4c00194f5dd5926f4d75ebcb324663b12505dbcf6f7f3d13167f2e7441f675bd2f07b451a03865d8f128ef14c531dff79129962a5b4a88e
-EBUILD homeassistant-0.90.0_beta4.ebuild 7946 BLAKE2B 6fd0bdd70c07361c3a9a1c8c35c6022cfca5047372f31ec21903fb3f3a1195b1b300f29e56975e3dc4b5271f55d6d8a35be5b5f9113fa54a8a49bfca7acb3331 SHA512 6b0b0d087c5798de94bf1baa8c675fc93365592b56059604abaffa11848f34f056a2141cc0cd83ccaf0cf6b254ee0876d3b7e8b17af07aa173eff5b11f6f6f3c
+EBUILD homeassistant-0.90.0_beta4.ebuild 7990 BLAKE2B 0ef3402eeff57254455a40f100c49780dff2fd9ecc1cbecd2cf007c35d4c9c137675063372ddc1567dce0b4a2b590874d71aff4a50765b9f57f36ddde4666f20 SHA512 6ffe0b71f3d84fc497bd7445423b514e394f2e5c089d6bb8af399b4e6bdc3d9b11acb2ec7980ce5833cf23bdf6d8128144da2da9112d55e7710c13f271f1d9ca
 MISC metadata.xml 1660 BLAKE2B 2d3d0da2ed547d095d2bb31e2b5a786033aa02e94fe49015637b39b86290c35953087aae05e9079f4b507e82c4fd13cf3fa194a917dd074f2db86fd880016344 SHA512 98e56031ec099e9ae88e9ce164453cebac18b317087a1519cb6e65d1886b924208aa807a8c8a8ef3854780c7bece9a905cb85aa80d08b94a599d172c4bf58e7e
diff --git a/app-misc/homeassistant/homeassistant-0.90.0_beta4.ebuild b/app-misc/homeassistant/homeassistant-0.90.0_beta4.ebuild
index 2edbca299..f2d4d89ca 100644
--- a/app-misc/homeassistant/homeassistant-0.90.0_beta4.ebuild
+++ b/app-misc/homeassistant/homeassistant-0.90.0_beta4.ebuild
@@ -55,6 +55,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/snitun-0.13[${PYTHON_USEDEP}]
 
 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
 	=dev-python/beautifulsoup-4.6.3[${PYTHON_USEDEP}]
diff --git a/dev-python/snitun/Manifest b/dev-python/snitun/Manifest
new file mode 100644
index 000000000..8790eb267
--- /dev/null
+++ b/dev-python/snitun/Manifest
@@ -0,0 +1,3 @@
+DIST snitun-0.13.tar.gz 12373 BLAKE2B facc3cb8abc39dc7b4df27fae74a96ac6fc7e36b2e96913e92b2ceee3ccfeddfed28301630192fd3ddbc01fc159097ce857a6763c50eb0d00175c7e779984f8c SHA512 293edd75ff44a841ea47c0a378b9bb8e4bc1e4a1c2fd2f6d53ed51931c97dffa6ddcd6df4731011067ef3dddf4af17e522a3735757ef1949a99b9cfe56ba4d22
+EBUILD snitun-0.13.ebuild 691 BLAKE2B 1c50cf3d4b2d729e6f81318e2c444003929ced1e1d675f41f43658728d12bcc29fecc636b5e7ea12450655382501b4640163a7f74b3733cf3bf7032ddc0d6fec SHA512 3264efac0cbbcf63262873d05cfaf32561bc2965fc71d171d4f88efd15702660e5a6e37c973852810cbc276aed18224bdbcd8740ae4bf45ae04dfaf954db168b
+MISC metadata.xml 464 BLAKE2B 4cdc86467730ace375222c3ff6dd88c8257f555bb6b902820f92902ae2ea7825adcf72040a3cc42ca5503d5995d76598269ce361777989a58fb858b270d6c03b SHA512 bc1a3831bbac5215eb9e7bb0d2cddb8df6decd0635a7f9f48ebc70d4cd97530cd77bd1514c3e0852b7c2b55e4002a857c911bbcf9939abbc6b2ab55a3c2ec94b
diff --git a/dev-python/snitun/metadata.xml b/dev-python/snitun/metadata.xml
new file mode 100644
index 000000000..b7a0aeeba
--- /dev/null
+++ b/dev-python/snitun/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>b@edevau.net</email>
+    <name>Andreas Billmeier</name>
+  </maintainer>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">snitun</remote-id>
+    <maintainer status="unknown">
+      <email>opensource@nabucasa.com</email>
+      <name>Nabu Casa, Inc.</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/snitun/snitun-0.13.ebuild b/dev-python/snitun/snitun-0.13.ebuild
new file mode 100644
index 000000000..507022e27
--- /dev/null
+++ b/dev-python/snitun/snitun-0.13.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors Andreas Billmeier b (at) edevau.net
+# Distributed under the terms of the GNU General Public License v3.0
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="SNI proxy with TCP multiplexer"
+HOMEPAGE="https://www.nabucasa.com/ https://pypi.org/project/snitun/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL v3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+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
+}