diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index f430140c7..2d1597f82 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,5 +1,7 @@
 DIST platformio-5.1.1.tar.gz 215305 BLAKE2B a7854138dec1b5b58c4f715dde98a273ed08c0da7fb305f89490944c210737c7c500731b21a5a9cb2bf3be3925f1666ef1084992b99df46d3ee83b449baaaa35 SHA512 f74ae3cb46065379b90c7ec3574d6ff0076085cd891bf41be2f38b6c6b59f87f4d013c1da6e4825f7d831ed17136e433385ab07c3f16b31342d5415192f87eff
 DIST platformio-5.2.0.tar.gz 217533 BLAKE2B d1a439f4900b7dd978190b5cfd9d807eedd85a1f090c7c99da22254ba1e0b7de682ff6894cd9920ae09890a27e41c01b80ce4601e7a78bb45e908f24c0cb9795 SHA512 0b1b78f0098d7327d599097122fc7d23fbadb09d89f22556a0b07ec785bc30269f2a44e27c465d9510a6b6e6c285e3e7a7664962822a882f8301b8d07ba617f2
+DIST platformio-5.2.1.tar.gz 218221 BLAKE2B 2cbc8f511159ecee8ed4600d27ed18e25977efe51ad014a41b8135c487d40597fe3b5ebed0c1a01a4c4a3af19dc044faf35388b667f331f939f74622299d2efe SHA512 ea917fcbeef0f2f576ab80727eaed7fdd491805f208fde0fc22df3d3111050f3ac2a1d51634d572003c624ed6041ddb28fcf6c004058f6505c23eb8c3aecc49a
 EBUILD platformio-5.1.1-r1.ebuild 2230 BLAKE2B f973fd2a5f56be44c7c0e75b17e7abb1653584ac5f282fe425ded7b4de9a03e2f3f11a247f17295e16d662e12a587d71f7c21657e90f8eb849120ab5bf7daa05 SHA512 fc692865fc52655a34d80c7a92147d583f3f9ea252f80ce443794112702591f081a7464951e0624f69f2bc1a2822c2f7b9d00f35eefb33e74c6ff0a0510e4d92
 EBUILD platformio-5.2.0.ebuild 2235 BLAKE2B bcdcc17e3dd225e20407ff579b907062920de58039bd0411fe41ff5bad50135d816d020a4413316fb9c84abe8b2681d02d5b13ca68811ae460d3f299247e8dab SHA512 711f2f34ba1fb3e7eb5f5fd20784dd2bb50e21dcb7085830f24bec3f1aa20212e1d848d479b5ff73add5119274f1068f4e60be087e7ca5e089cade7a15ab45a2
-MISC metadata.xml 455 BLAKE2B 7a9e9b59b64d7f5df8e799c66054f01cb56076343646d2055346e77fa8f89c3dd26f65ba5abc87603af2452f88bb237aa08ec47a9d555ca2c477ace7c70c5ca3 SHA512 42cd62b76f054fb985ec9d34836f952e9d2fa3cf4d52d0b737b374e23a1588094f261f238fbd12fb06854e420735037d927814f1ed200a2630523241eaeacc79
+EBUILD platformio-5.2.1.ebuild 2187 BLAKE2B 168a9e0554c1ca50f6abb887deb11a3c4d206e5114f55557a79ac7ed1e60ca8fd3e666fb65f98700c47d6f4012632eb30b9e1406a11faca3a783b19da1c50727 SHA512 14eda82ce2ec6f76c6939e8de9771785d10277bcbf89b71c514703505315d6c57d7c4554fff3e7d6c85bf52452ba176da1addc2e6459bfbdd707ade348f3ebac
+MISC metadata.xml 457 BLAKE2B 558c6e7f69c6ede09bcd9cc706a3d0186a67ab8911b4278e4ed669cae32790db1ca282abc527e757345f91303eea337c03594a47777d50fb4609e9e9eae2dc8f SHA512 478409895f41c84f1c85c17c58f9a41cec864ed6df0b24b01d3d3b117b1109ae2bf15fc70871159193e514b64e108dbb37162517aa183c8c33fc350054dd81d4
diff --git a/dev-embedded/platformio/metadata.xml b/dev-embedded/platformio/metadata.xml
index 0deaff1e1..89e033c6b 100644
--- a/dev-embedded/platformio/metadata.xml
+++ b/dev-embedded/platformio/metadata.xml
@@ -8,8 +8,8 @@
   <upstream>
     <remote-id type="pypi">platformio</remote-id>
     <maintainer status="unknown">
-      <email>contact@platformio.org</email>
-      <name>PlatformIO</name>
+      <email>contact@piolabs.com</email>
+      <name>PlatformIO Labs</name>
     </maintainer>
   </upstream>
 </pkgmetadata>
diff --git a/dev-embedded/platformio/platformio-5.2.1.ebuild b/dev-embedded/platformio/platformio-5.2.1.ebuild
new file mode 100644
index 000000000..4930af29f
--- /dev/null
+++ b/dev-embedded/platformio/platformio-5.2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A professional collaborative platform for embedded development. Cross-platform IDE and Unified Debugger. Static Code Analyzer and Remote Unit Testing. Multi-platform and Multi-architecture Build System. Firmware File Explorer and Memory Inspection. IoT, Arduino, CMSIS, ESP-IDF, FreeRTOS, libOpenCM3, mbedOS, Pulp OS, SPL, STM32Cube, Zephyr RTOS, ARM, AVR, Espressif (ESP8266/ESP32), FPGA, MCS-51 (8051), MSP430, Nordic (nRF51/nRF52), NXP i.MX RT, PIC32, RISC-V, STMicroelectronics (STM8/STM32), Teensy"
+HOMEPAGE="https://platformio.org https://github.com/platformio/platformio-core/ https://pypi.org/project/platformio/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+	')"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		>dev-python/bottle-0.12[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/click-7.1.2[${PYTHON_MULTI_USEDEP}]
+		!=dev-python/click-8.0.2[${PYTHON_MULTI_USEDEP}]
+		dev-python/colorama[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/marshmallow-2.20.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyelftools-0.27[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyserial-3[${PYTHON_MULTI_USEDEP}]
+		<dev-python/pyserial-4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/requests-2.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/semantic_version-2.8.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/tabulate-0.8.3[${PYTHON_MULTI_USEDEP}]
+		<dev-python/tabulate-1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/aiofiles-0.7.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/ajsonrpc-1.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/starlette-0.16.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/uvicorn-0.15.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wsproto-1.0.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
+	')"
+
+src_prepare() {
+	sed -i -e 's/"zeroconf==0.36.*"/"zeroconf"/' setup.py || die "zeroconf version helper failed!"
+	eapply_user
+}