diff --git a/net-voip/homer-conferencing/Manifest b/net-voip/homer-conferencing/Manifest
index 6042884..812b0eb 100644
--- a/net-voip/homer-conferencing/Manifest
+++ b/net-voip/homer-conferencing/Manifest
@@ -1,3 +1,3 @@
 DIST homer-conferencing-0.24.1.tar.gz 1297045 SHA256 738cd4a1e8b437936c904bdea649c0ee12ecca2caa1bef5c585925eabe84ff44 SHA512 ea2d1a5224048668e20a62f142370910f337b3b56b94c9a92a9b7530652ceed67a59223fac57ee0d835c31545d2d06c21329a0463680936d32a1455dbb2fac33 WHIRLPOOL b16ccdea6c5ea0845aca4f31a2d6258cf6a71258c531ee36a02b2844814df73b26229ffc96129532b4f9c1f2070a9cd279b720b7286e691e488bc7b524c47278
-EBUILD homer-conferencing-0.24.1.ebuild 1135 SHA256 9a2a3e9a25e78892dc1ba8cc652e368c2e461ecdb4d5514a936b6d6786a0b249 SHA512 200a1a1a5819ba756bf122eab81f8cb34f2866bd694c1beeabab728e0f4cf5b285bed763840cacb609c541ff42a8b11ffef30371e14a14b778a3007aa73ce625 WHIRLPOOL e15d8b38d1b4e626c5457eed4960742a4a4b18f56946ed1b6c04beb1c87e597e7051a0e0021e3f13c62aea0950e5e694facfe5a650c0613e67f2c2ca147a6a0c
-EBUILD homer-conferencing-9999.ebuild 1135 SHA256 9a2a3e9a25e78892dc1ba8cc652e368c2e461ecdb4d5514a936b6d6786a0b249 SHA512 200a1a1a5819ba756bf122eab81f8cb34f2866bd694c1beeabab728e0f4cf5b285bed763840cacb609c541ff42a8b11ffef30371e14a14b778a3007aa73ce625 WHIRLPOOL e15d8b38d1b4e626c5457eed4960742a4a4b18f56946ed1b6c04beb1c87e597e7051a0e0021e3f13c62aea0950e5e694facfe5a650c0613e67f2c2ca147a6a0c
+EBUILD homer-conferencing-0.24.1.ebuild 1154 SHA256 34033e646c96e7c497df67f6d6ab842dd125a93f871bf4889f46aec01c86c3f5 SHA512 153dfeab37ecda76fae119f4d3e78ffc2bd5e673d4ba05a2ce485ab087650b3dc8c5eee4fc701979490692b89c79becb6fac42b13847bdb56688e26c809ddf9d WHIRLPOOL 86dd07462eb1893831f0ad9b3f38debfd7426255a514166897f1da9cc65c6f7d98970e0ed1bba18787c037e12ef64ccfac7f685f6b845aab96414ccccdac416a
+EBUILD homer-conferencing-9999.ebuild 1154 SHA256 34033e646c96e7c497df67f6d6ab842dd125a93f871bf4889f46aec01c86c3f5 SHA512 153dfeab37ecda76fae119f4d3e78ffc2bd5e673d4ba05a2ce485ab087650b3dc8c5eee4fc701979490692b89c79becb6fac42b13847bdb56688e26c809ddf9d WHIRLPOOL 86dd07462eb1893831f0ad9b3f38debfd7426255a514166897f1da9cc65c6f7d98970e0ed1bba18787c037e12ef64ccfac7f685f6b845aab96414ccccdac416a
diff --git a/net-voip/homer-conferencing/homer-conferencing-0.24.1.ebuild b/net-voip/homer-conferencing/homer-conferencing-0.24.1.ebuild
index 825c43c..909d4a9 100644
--- a/net-voip/homer-conferencing/homer-conferencing-0.24.1.ebuild
+++ b/net-voip/homer-conferencing/homer-conferencing-0.24.1.ebuild
@@ -7,12 +7,14 @@ EAPI=4
 DESCRIPTION="Homer Conferencing (short: Homer) is a free SIP spftphone with advanced audio and video support."
 HOMEPAGE="http://www.homer-conferencing.com"
 
+MY_PN="Homer-Conferencing"
+
 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
-	EGIT_REPO_URI="git://github.com/Homer-Conferencing/Homer-Conferencing.git"
+	EGIT_REPO_URI="git://github.com/${MY_PN}/${MY_PN}.git"
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/Homer-Conferencing/Homer-Conferencing/archive/V${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/V${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
 	KEYWORDS="~x86 ~amd64"
 fi
 
@@ -33,6 +35,8 @@ RDEPEND=">=dev-libs/openssl-1.0
 DEPEND="dev-util/cmake
 	${RDEPEND}"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 src_compile() {
 	cd "${S}"/HomerBuild
 	emake all || die "make failed"
diff --git a/net-voip/homer-conferencing/homer-conferencing-9999.ebuild b/net-voip/homer-conferencing/homer-conferencing-9999.ebuild
index 825c43c..909d4a9 100644
--- a/net-voip/homer-conferencing/homer-conferencing-9999.ebuild
+++ b/net-voip/homer-conferencing/homer-conferencing-9999.ebuild
@@ -7,12 +7,14 @@ EAPI=4
 DESCRIPTION="Homer Conferencing (short: Homer) is a free SIP spftphone with advanced audio and video support."
 HOMEPAGE="http://www.homer-conferencing.com"
 
+MY_PN="Homer-Conferencing"
+
 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
-	EGIT_REPO_URI="git://github.com/Homer-Conferencing/Homer-Conferencing.git"
+	EGIT_REPO_URI="git://github.com/${MY_PN}/${MY_PN}.git"
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/Homer-Conferencing/Homer-Conferencing/archive/V${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/V${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
 	KEYWORDS="~x86 ~amd64"
 fi
 
@@ -33,6 +35,8 @@ RDEPEND=">=dev-libs/openssl-1.0
 DEPEND="dev-util/cmake
 	${RDEPEND}"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 src_compile() {
 	cd "${S}"/HomerBuild
 	emake all || die "make failed"