diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 96220b130..d0d9b3fb8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@
   * remove unused frontend-20200107.0
     add frontend-20200108.0
   * homeassistant-0.104.0_beta0
+  * patch ESPHome for pyyaml-5.2
 
 2020-01-07
 	* bump pyvizio-0.0.9
diff --git a/dev-embedded/esphome/Manifest b/dev-embedded/esphome/Manifest
index d73752da1..a2d1ad7b7 100644
--- a/dev-embedded/esphome/Manifest
+++ b/dev-embedded/esphome/Manifest
@@ -21,6 +21,7 @@ EBUILD esphome-1.14.2.ebuild 2429 BLAKE2B f72e80a8bd816a3321db9ecdd755cf9d2d3186
 EBUILD esphome-1.14.3-r1.ebuild 2485 BLAKE2B 88fe7a00e5752a33e2ce7339df536c292ba3e62fde89c4538b80baff4db2effb7f337e72e876659865f0de90d62830fcecfdac6b26234345b6157c4e81ab5bdc SHA512 09d26863cba206323b1dddca93fca43ac8f5bc8d021675163250b99825a80288ccc60b7641b60ac80c9cdb4f7639042b38670dd3d09adcb87c7270023a5eddf8
 EBUILD esphome-1.14.3-r2.ebuild 2511 BLAKE2B 6f4a4f1c7113b07a7b2015784dbf62dd618a8f8b8d0331ef6428884210b23a0543e15380dcd7e52397d5cb040755542540213959844fbc741071a64d18c66339 SHA512 cf605c65a990dd9af66872359f8d1cfb3c9e6e2cd0a3300b23500b71393398da3a5a4796e61e7b89848a6e2f903f8d3c4b7940e0a216c411a958114e9615d23f
 EBUILD esphome-1.14.3-r3.ebuild 2745 BLAKE2B 408d17eda3c40e8cd37e55b37417c2940598a3abde321e4cb28b176c1dbcc70c7c0eb914fbd04b8f0587a5638180080eea035d78a8c4375fb8b1b4bb9abbd325 SHA512 2be8ddc429fa96264ac0c29db3f1da43f6411234a40a43bde2cef62fb0fdd9911ff8adee75207bb5afaaa178754b3103be63cfa015ef0c91dcef59a691a89b81
+EBUILD esphome-1.14.3-r4.ebuild 2837 BLAKE2B 03444b565bea09cc2da6b91f20b23f4c4df165eeecd96928237a8823bd77f5fccef3f51ee1c31f52b74a2fc731a7d54e91a054184871061c31e057413403fabb SHA512 94dd943285d95c7100ff267fbcdc272fb8d0d0779668bdf4fb983e69759280183a63a40f1ee7fd7b1cd9bb3a016052169f6c912b04e0dcac6167b546fb40e92f
 EBUILD esphome-1.14.3.ebuild 2485 BLAKE2B 8e71310c35d92c5394f3a43ce94aafcb4c9df6b36c696450217290f35bff765bbd52deb7e0dbcc8f2847540e4e5d167634da079bfe2d220653f602a2e0ea79f2 SHA512 af1f224b782128c4f4777b599ba7836dc44cb2bcc536afdf2eecbc1dd294ce52c809d89c1136d2b8e1193ee361b2a96a0f12392a341e01c956c7d0d4dc406b3b
-EBUILD esphome-9999.ebuild 2485 BLAKE2B 88fe7a00e5752a33e2ce7339df536c292ba3e62fde89c4538b80baff4db2effb7f337e72e876659865f0de90d62830fcecfdac6b26234345b6157c4e81ab5bdc SHA512 09d26863cba206323b1dddca93fca43ac8f5bc8d021675163250b99825a80288ccc60b7641b60ac80c9cdb4f7639042b38670dd3d09adcb87c7270023a5eddf8
+EBUILD esphome-9999.ebuild 2837 BLAKE2B 03444b565bea09cc2da6b91f20b23f4c4df165eeecd96928237a8823bd77f5fccef3f51ee1c31f52b74a2fc731a7d54e91a054184871061c31e057413403fabb SHA512 94dd943285d95c7100ff267fbcdc272fb8d0d0779668bdf4fb983e69759280183a63a40f1ee7fd7b1cd9bb3a016052169f6c912b04e0dcac6167b546fb40e92f
 MISC metadata.xml 361 BLAKE2B 0752256cba8c0b90e3dcce71eb5c3a8307adbab281c5229abc8aaa21d4ee1b94f2f898ccd9c43c4ff488a995f2e6271a5aa651f78a7e6d35cba0cc6302d387ed SHA512 80327a1c6833cadd82cfcbfa31e48661a8c11b38831c4c6cef002523244be67ee50585c3a10903ef6126974c4f36347f08e39c5a64ab43ad7ebb632106e1c4c1
diff --git a/dev-embedded/esphome/esphome-1.14.3-r4.ebuild b/dev-embedded/esphome/esphome-1.14.3-r4.ebuild
new file mode 100644
index 000000000..ed70aa9fc
--- /dev/null
+++ b/dev-embedded/esphome/esphome-1.14.3-r4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit user 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}/${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 ~x86 ~amd64-linux ~x86-linux"
+IUSE="server test"
+
+RDEPEND=""
+DEPEND="${REDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.11.7[${PYTHON_USEDEP}]
+	>=dev-embedded/platformio-4.0.3
+	>=dev-python/pyyaml-5.1.2[${PYTHON_USEDEP}]
+	>=dev-python/paho-mqtt-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/colorlog-4.0.2[${PYTHON_USEDEP}]
+	~dev-embedded/esptool-2.7[${PYTHON_USEDEP}]
+	>=dev-python/typing-3.6.6[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.10.0[${PYTHON_USEDEP}]
+	>=dev-libs/protobuf-3.10.0
+	>=dev-python/pyserial-3.4[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	server? ( >=dev-python/ifaddr-0.1.6
+			>=www-servers/tornado-5.1.1[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_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"
+
+pkg_setup() {
+	if use server; then
+		enewgroup "${PN}"
+		enewuser "${PN}" -1 -1 "/etc/${PN}" "${PN}"
+	fi
+}
+
+src_prepare() {
+	sed -e 's;protobuf==3.10.0;protobuf==3.10.1;' \
+		-i esphome.egg-info/requires.txt \
+		-i setup.py
+	sed -e 's;paho-mqtt==1.4.0;paho-mqtt==1.5.0;' \
+		-i esphome.egg-info/requires.txt \
+		-i setup.py
+	sed -e 's;PyYAML==5.1.2;PyYAML==5.2;' \
+		-i esphome.egg-info/requires.txt \
+		-i setup.py
+	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
+}
diff --git a/dev-embedded/esphome/esphome-9999.ebuild b/dev-embedded/esphome/esphome-9999.ebuild
index 35cc058d5..ed70aa9fc 100644
--- a/dev-embedded/esphome/esphome-9999.ebuild
+++ b/dev-embedded/esphome/esphome-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,6 +41,7 @@ DEPEND="${REDEPEND}
 	~dev-embedded/esptool-2.7[${PYTHON_USEDEP}]
 	>=dev-python/typing-3.6.6[${PYTHON_USEDEP}]
 	>=dev-python/protobuf-python-3.10.0[${PYTHON_USEDEP}]
+	>=dev-libs/protobuf-3.10.0
 	>=dev-python/pyserial-3.4[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
 	server? ( >=dev-python/ifaddr-0.1.6
@@ -68,6 +69,19 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	sed -e 's;protobuf==3.10.0;protobuf==3.10.1;' \
+		-i esphome.egg-info/requires.txt \
+		-i setup.py
+	sed -e 's;paho-mqtt==1.4.0;paho-mqtt==1.5.0;' \
+		-i esphome.egg-info/requires.txt \
+		-i setup.py
+	sed -e 's;PyYAML==5.1.2;PyYAML==5.2;' \
+		-i esphome.egg-info/requires.txt \
+		-i setup.py
+	eapply_user
+}
+
 python_install_all() {
 	dodoc ${DOCS}
 	distutils-r1_python_install_all