diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 67c81683d..6071cf07f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -18,6 +18,7 @@ To remove the (conflicting) wrong one, do a:
   * bump home-assistant-frontend-20200915.0
   * update icmplib-1.2, change LICENSE="LGPL-3"
   * fix sonarr https://git.edevau.net/onkelbeh/HomeAssistantRepository/issues/164
+  * pymata-express, fix https://git.edevau.net/onkelbeh/HomeAssistantRepository/issues/150
 
 2020-09-14 homeassistant-0.115.0_beta9
   * update PyGithub-1.43.8
diff --git a/dev-python/pymata-express/Manifest b/dev-python/pymata-express/Manifest
index c5005c08f..8b895eb40 100644
--- a/dev-python/pymata-express/Manifest
+++ b/dev-python/pymata-express/Manifest
@@ -1,5 +1,5 @@
-DIST pymata-express-1.13.tar.gz 24084 BLAKE2B 13802e5d971ec3334cbcdb01fbdc35912ed30bc097b0660ac4ce8b0adea9c5abcb2602885641885f479c73a5c31f2f45427f19673be3424c22c30d2a566ac3ae SHA512 1cd2ca07eb00319bd149aa7587317dda4537c27363ae49f87026c674875c02a79d2409c7e39bd6990750062df8dfbd73b20c0e24eaf61eab4ce5e35568098ab2
-DIST pymata-express-1.17.tar.gz 24361 BLAKE2B 24de7acfc685b1db5569d7551922840b3a446bec65250cc69a4cf76513ef73ad6302647f53d7c036800c6e8e16a9420fefa67f384e482e4a3716d76cc23243bf SHA512 ad151bc609b76f7418bc1427b18aa7342f370170fcff7d2c2b7922f8d5a918769285e6e0c145919243e298009c9d717c1e4436c624ae718b88b68dbb91ebd55d
-EBUILD pymata-express-1.13.ebuild 770 BLAKE2B 98e21685da480ab113a2237f3a226e42ab5be2aaa7f59820c04e14dd204e1bc31590dafff94b73adbe02aba1ac1ebec41b63b96a2e3a1ada08379e46ed54ed9b SHA512 dc49136476cb9587a50282a513b898b3fe2711ce47668036e9f48faec9cda1671b6a4639369566ffc9e73cc0b0585aa334a9208a97a64053dc1cfa495921eefa
-EBUILD pymata-express-1.17.ebuild 770 BLAKE2B 98e21685da480ab113a2237f3a226e42ab5be2aaa7f59820c04e14dd204e1bc31590dafff94b73adbe02aba1ac1ebec41b63b96a2e3a1ada08379e46ed54ed9b SHA512 dc49136476cb9587a50282a513b898b3fe2711ce47668036e9f48faec9cda1671b6a4639369566ffc9e73cc0b0585aa334a9208a97a64053dc1cfa495921eefa
+DIST pymata-express-1.13.tar.gz 193015 BLAKE2B 4d5b16ad79673b3051e6167f06fc0184198e03180f070bf89778ac2108707114ada8d545e677e8e297db54080d12d0b1bd0ff99104a61d286e29afb44ead3a04 SHA512 7ef98c938ddd6c42df77660a6dd3cfaa8bb1b8906e08dcd4676e06a97bd9808023069c0118808b100b5433bc0c6d621a4536a85ccd0b5d56f5b1703a897c7fea
+DIST pymata-express-1.17.tar.gz 153619 BLAKE2B a41d74c8d0b1dc206a0bd4393fca0df0762ddbe195913950e23433bbb1758a5446dd679d46cdbd37b743d2a8f3f04fe538c12e50dbd12478a48b43759bc61ea2 SHA512 bd610f6c82db4e5030be917e24d88b7827612e0baf574f769279ce8eba32f087ec25bd9f2b11fd1f42fee2ecea4744cd1facd58e8c9f17e8bbce28346c930408
+EBUILD pymata-express-1.13.ebuild 891 BLAKE2B 3d1b27b7bf32052316445b05b035954ccbf492d4ae15332965fa5e8d6f5d93160894bee8c923e4bc2690420db970565a9640ebb8d4dea8c2329512e4e4e0ab94 SHA512 fa8f86feeb6f59131e996e3a376e16ece8fca4a469f406c029bfa0d76da8aaf963fb8a33f2423b976196ca7135e0d07ba568fdf25541181f2c17aad88712cd79
+EBUILD pymata-express-1.17.ebuild 891 BLAKE2B 3d1b27b7bf32052316445b05b035954ccbf492d4ae15332965fa5e8d6f5d93160894bee8c923e4bc2690420db970565a9640ebb8d4dea8c2329512e4e4e0ab94 SHA512 fa8f86feeb6f59131e996e3a376e16ece8fca4a469f406c029bfa0d76da8aaf963fb8a33f2423b976196ca7135e0d07ba568fdf25541181f2c17aad88712cd79
 MISC metadata.xml 460 BLAKE2B 2a23546abfcfb119f6db14032bd4a260b6d3c61077bfc71a069ceb2063e84704aaa97042fbeaf96fb76549e8c14778d2722a94345137a3c4a8e9a5b774dd2815 SHA512 ca1ab1b6f3ffc3ef7973b2d7f623b3a47c5a4bff2352f7585f75b4568d9cfd187bdd157ced1586b2f7d4034b384fff35368165d088615d4828684e60b893b2df
diff --git a/dev-python/pymata-express/pymata-express-1.13.ebuild b/dev-python/pymata-express/pymata-express-1.13.ebuild
index c67420321..ebbd2adb1 100644
--- a/dev-python/pymata-express/pymata-express-1.13.ebuild
+++ b/dev-python/pymata-express/pymata-express-1.13.ebuild
@@ -3,13 +3,16 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit distutils-r1
 
 DESCRIPTION="A Python Protocol Abstraction Library For Arduino Firmata using Python asyncio"
 HOMEPAGE="https://mryslab.github.io/pymata-express/ https://pypi.org/project/pymata-express/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+# SDIST at Pypi is missing some files
+# SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/MrYsLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3+"
 SLOT="0"
@@ -17,7 +20,7 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-python/pyserial[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
+BDEPEND="${REDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/pymata-express/pymata-express-1.17.ebuild b/dev-python/pymata-express/pymata-express-1.17.ebuild
index c67420321..ebbd2adb1 100644
--- a/dev-python/pymata-express/pymata-express-1.17.ebuild
+++ b/dev-python/pymata-express/pymata-express-1.17.ebuild
@@ -3,13 +3,16 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit distutils-r1
 
 DESCRIPTION="A Python Protocol Abstraction Library For Arduino Firmata using Python asyncio"
 HOMEPAGE="https://mryslab.github.io/pymata-express/ https://pypi.org/project/pymata-express/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+# SDIST at Pypi is missing some files
+# SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/MrYsLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3+"
 SLOT="0"
@@ -17,7 +20,7 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-python/pyserial[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
+BDEPEND="${REDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]