diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8be86db45..ade682932 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,9 @@ To remove the (conflicting) wrong one, do a:
     - added (old) urwid-1.3.1
     - added (old) MechanicalSoup-0.6.0
     - reworked deps for hangups-0.4.10
+  * update esphome
+    - esphome-1.15.0 -> stable
+    - update esphome-1.15.1
 
 2020-09-18 homeassistant-0.115.0
   * Py3.8 flagged: atenpdu, baidu-aip, bizkaibus, blinkt, brottsplatskartan, pydroid-ipcam
diff --git a/dev-embedded/esphome/Manifest b/dev-embedded/esphome/Manifest
index ed312ebf2..4fd762554 100644
--- a/dev-embedded/esphome/Manifest
+++ b/dev-embedded/esphome/Manifest
@@ -10,6 +10,7 @@ DIST esphome-1.14.4.tar.gz 1005274 BLAKE2B cb974e81c36d70f48984d2d23c87d52352a69
 DIST esphome-1.14.5.tar.gz 1005279 BLAKE2B a403a8c48c67640555c466b42e4476c514b1446c69e9470f3b48f56aa4e0c7e84ec2c5dcbf96711ed9c4ff5693f5ef937af6fed01e627882e52abdfb79d37207 SHA512 bf07d994c2f33a3051dbc25d377ec18a615b02fa9448bcf7aeed48fa1ec1d6fa55b08433c97113caa31eb8073eb41e935ac80f1d9fcee0cef86eb0afcd98cb2d
 DIST esphome-1.15.0.tar.gz 1221821 BLAKE2B 1286f18463c5839e4475da4e95a95b3f1f77eb7e2a9e66de808280d04ef840528b61e7a692c573ad690f0814b2fb2873c8e4d3ce3495fbf019502605a2a6639e SHA512 844c179869b9ca38f253ea8b8849266f0a5ed4cb5020a6ec981817d5a37f6c9a900c3db99cceac2bbb96fad9621d5e925e584db1c7fcf53770118e793e83d323
 DIST esphome-1.15.0_beta4.tar.gz 1221777 BLAKE2B 52601aaa0787fb322f4e519e22640b6c7ff2489fbbe7884c7865ada763ca3567e5427fb7a05cc6cf54ca502c9ea3eb847750685b3b90f672bb21779c4447519e SHA512 eb5e9163301d4187077d1b3b57a56fc9fb562063fc63fff27b1d07a90f339f63c246e82f4a2e726a529d71e6937312bc98476f215296648b4a324b2e74603072
+DIST esphome-1.15.1.tar.gz 1221719 BLAKE2B f8c9cd4af384545fadd5dcb74e5ec584ad0bfec1205bc550a3ec56a21ef822d8600c321327930674500ae5e9d4a4c7e8263faebba58196132019f206d94b2bb1 SHA512 8ed3791f5ee527153a9163d6cf6571cd2c8e2c2913f3362650569856dc20566664785600b04ad3da7dbb3b0f1f7305381cd46a323c040544742a20dbf0ccf2bc
 EBUILD esphome-1.13.2.ebuild 2200 BLAKE2B 508d86e0c4d6909bd149c92642c69a75d864b45a79d13b381dd7c6141a245e011e58c62fda49e285b0b9f02931f67486db0d56082fc84f5b995aa20b2573c7bb SHA512 567288ab7d4ee64dbc8f6b6817a03b1a19ef638be8d89c77e03d015961b9d3d26dd8e165db381879e254246bb2fa7d3ecf74c0221498ad9b85217589e9d0da52
 EBUILD esphome-1.13.6-r1.ebuild 2252 BLAKE2B d554111ca4d1a3a0f8e0ed20e3e3f25411edb314fa2aaacede11d133be9dffcf8d484c3b071d2d31ec4b79515b8616c1a30a226839ab07df452911fe79a10208 SHA512 1075af5d95a03cbb9f0f00638bd8a159ce0caf322c41efd4d6b79b062222c95cba94c3c1b2f55690cb1f5b46f615f6150349887cf6c7d0aab16db82f131d7f34
 EBUILD esphome-1.13.6.ebuild 2200 BLAKE2B 508d86e0c4d6909bd149c92642c69a75d864b45a79d13b381dd7c6141a245e011e58c62fda49e285b0b9f02931f67486db0d56082fc84f5b995aa20b2573c7bb SHA512 567288ab7d4ee64dbc8f6b6817a03b1a19ef638be8d89c77e03d015961b9d3d26dd8e165db381879e254246bb2fa7d3ecf74c0221498ad9b85217589e9d0da52
@@ -25,5 +26,6 @@ EBUILD esphome-1.14.5-r2.ebuild 2890 BLAKE2B cfa11c851df57722f7c019016ef653887d7
 EBUILD esphome-1.14.5.ebuild 2711 BLAKE2B af450032767c0d0f37acfa5ae27a2f7af86b22cb68774a640e6d9bd4ac0424c3c7d947691218463de05ece500588c81b518b0c9c47865452776e91f013cc97e5 SHA512 28b64c51ecec5b4c0c02c45a0b9ddb90137decadacf5cabf52b8a83a1810567a33435b1d4ae3236a90c4b3d150e0c36358fee5e78caad2283a50ad61e6dbea21
 EBUILD esphome-1.15.0.ebuild 2767 BLAKE2B dbe08b83780e8126e00b41e33d1795568b896bd1d93e674bb4e4e8edeca44808c1a16b92d57896d9a3b8ec6dfc962dc8d2c8945e058c06ce2a04609cfa59744e SHA512 2de7953efc4881b8e06226f7286bbf2351114cdcad24ad28b0945b10fa6817d202a4ab58b44975c0a864bd3907893bc22bfcb305b073fd7b808c4b3689d87862
 EBUILD esphome-1.15.0_beta4.ebuild 2611 BLAKE2B 949b99c0d926affbcf7239ea2ea93b95cab3d456d053c50b726f99a2dc1ddd6c656f707dfd16f66653fafbe2de69b7bf6727165619a25f069499c933b8307672 SHA512 596d6ca03a6bc5caa0de03ea4d62ef66b0a5b7a2d2d02ebd37e68f21f8951353fae5bf8e058cbb5e36d0a5af0943adc460b4ff787ce31f53e6f65bdc4c809c9b
+EBUILD esphome-1.15.1.ebuild 2706 BLAKE2B 6a7624fce9333697d19aeb8df76defaed6502d3a32f2934b958a406b6e1063713a660b81c440d72305f0f555470f76223ad5a783fa53c7128c96165b69b82a7d SHA512 270fefa155974aa9aa9ef8b89076bbb5c2f34604c895394489b9f1cde4b06a41660ff74a8a4cbb18f4fc6ed1edb15f61938ace09b045718d2a473d161b4d65a8
 EBUILD esphome-9999.ebuild 2602 BLAKE2B 2c6ac455c1c977b5a085065a04d7b7ba667598532d6fe576fea0171ffd7afac4de1d77a091d79b542a418cea7006c8d2411bc078ce774a1e030000592cbdbfd2 SHA512 1532d7786d06bdb30b1beba8aee72e492b836468ce10de5b0424b579d76a73592b4378f6f60a2dcb5055452e4f4c352d2d44471f40e005a5b2c44b53d5a0fc15
 MISC metadata.xml 568 BLAKE2B bf87d46e048c7db7d8bcbf2a4c9e730e3b084504ca3708520635c92805f99554ad88fe15eba5c9566f5db8c977bf11014aa8f4a94dcc3f5a9e633f15c7438516 SHA512 c84dd850464fa34e84576c1548c2a17b036543b682a2693ca3d95bdde62014e632116a84479ac42539e9d04e97386aa3326fe587043443dd1895d01bf70463c2
diff --git a/dev-embedded/esphome/esphome-1.15.1.ebuild b/dev-embedded/esphome/esphome-1.15.1.ebuild
new file mode 100644
index 000000000..9ac5f35b9
--- /dev/null
+++ b/dev-embedded/esphome/esphome-1.15.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..8} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit readme.gentoo-r1 distutils-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/esphome/esphome.git"
+	EGIT_BRANCH="dev"
+	S="${WORKDIR}/${P}/"
+else
+	MY_P=${P/_beta/b}
+	MY_PV=${PV/_beta/b}
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}/"
+fi
+
+DESCRIPTION="Make creating custom firmwares for ESP32/ESP8266 super easy."
+HOMEPAGE="https://github.com/esphome/esphome https://pypi.org/project/esphome/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+server test"
+
+RDEPEND="
+	server? ( acct-group/${PN} acct-user/${PN} )
+	$(python_gen_cond_dep '
+	  ~dev-python/voluptuous-0.11.7[${PYTHON_USEDEP}]
+	  ~dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	  ~dev-python/paho-mqtt-1.5.0[${PYTHON_USEDEP}]
+	  ~dev-python/colorlog-4.2.1[${PYTHON_USEDEP}]
+	  server? ( ~www-servers/tornado-6.0.4[${PYTHON_USEDEP}] )
+	  ~dev-libs/protobuf-3.12.4
+	  ~dev-python/protobuf-python-3.12.4[${PYTHON_USEDEP}]
+	  ~dev-python/tzlocal-2.1[${PYTHON_USEDEP}]
+	  ~dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+	  ~dev-python/pyserial-3.4[${PYTHON_USEDEP}]
+	  server? ( ~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}] )
+	  ~dev-embedded/platformio-4.3.4
+	  ~dev-embedded/esptool-2.8[${PYTHON_USEDEP}]
+	  ~dev-python/click-7.1.2[${PYTHON_USEDEP}]
+	')"
+
+	BDEPEND="
+	  $(python_gen_cond_dep '
+		  dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		  test? (
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytest[${PYTHON_MULTI_USEDEP}] )
+		')"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+The ESPHome dashboard listens on port 6052
+ESPHome configuration is in: /etc/${PN}
+dashboard command line arguments are configured in: /etc/conf.d/${PN}
+logging is to: /var/log/${PN}/{dashboard,warnings}.log
+support at https://git.edevau.net/onkelbeh/HomeAssistantRepository
+"
+
+DOCS="README.md"
+
+src_prepare() {
+	sed -e 's;protobuf==3.12.2;protobuf==3.12.4;' \
+		-i requirements.txt || die
+	eapply_user
+}
+
+python_install_all() {
+	dodoc ${DOCS}
+	distutils-r1_python_install_all
+	if use server; then
+		keepdir "/etc/${PN}"
+		fowners -R "${PN}:${PN}" "/etc/${PN}"
+		keepdir "/var/log/${PN}"
+		fowners -R "${PN}:${PN}" "/var/log/${PN}"
+		newconfd "${FILESDIR}/${PN}.conf.d" "${PN}"
+		newinitd "${FILESDIR}/${PN}.init.d-r2" "${PN}"
+		readme.gentoo_create_doc
+	fi
+}
+
+python_test() {
+	nosetests --verbose || die
+	py.test -v -v || die
+}
+
+pkg_postinst() {
+	if use server; then
+		readme.gentoo_print_elog
+	fi
+}