diff --git a/dev-libs/libQuotient/Manifest b/dev-libs/libQuotient/Manifest
index 502f3d8..2306f39 100644
--- a/dev-libs/libQuotient/Manifest
+++ b/dev-libs/libQuotient/Manifest
@@ -1,2 +1,2 @@
-DIST 0.6.0.tar.gz 556773 BLAKE2B 0361b7b88cb93dbbe1dee21751425e780eed68e2e50eed8bf79f01ff4eb49047130502d5b242b6c25871f5894ca2cf5d57069e44d22164dfd8c43efbb4485704 SHA512 42f7d1ee788cc2bd9d88f0ec4339573d1c4be85c462ddb81d4b4cc222fa46d3482bf4c231fd8c35f334aefa112f45251239a99c37456efcae0ca5d9359271f72
-DIST 0.6.1.tar.gz 557477 BLAKE2B f0e90c0bbf2eccc93cbb9a4598368929ebe2e03aea9db3b4ea1782e41cd96ae9812b649c3d2f3f3e62f09d7266dd4c27c24d87163c0ae05c0d122e734e6f59e2 SHA512 17f6bac381d62e3975d6099a92a80c6855ba078947f9855960e7c963c05e094127eb926e922868456eb0694bd5eb1f4294bb12bfdea73db1724313359a330e2e
+DIST libQuotient-0.6.0.tar.gz 556773 BLAKE2B 0361b7b88cb93dbbe1dee21751425e780eed68e2e50eed8bf79f01ff4eb49047130502d5b242b6c25871f5894ca2cf5d57069e44d22164dfd8c43efbb4485704 SHA512 42f7d1ee788cc2bd9d88f0ec4339573d1c4be85c462ddb81d4b4cc222fa46d3482bf4c231fd8c35f334aefa112f45251239a99c37456efcae0ca5d9359271f72
+DIST libQuotient-0.6.1.tar.gz 557477 BLAKE2B f0e90c0bbf2eccc93cbb9a4598368929ebe2e03aea9db3b4ea1782e41cd96ae9812b649c3d2f3f3e62f09d7266dd4c27c24d87163c0ae05c0d122e734e6f59e2 SHA512 17f6bac381d62e3975d6099a92a80c6855ba078947f9855960e7c963c05e094127eb926e922868456eb0694bd5eb1f4294bb12bfdea73db1724313359a330e2e
diff --git a/dev-libs/libQuotient/libQuotient-0.6.0.ebuild b/dev-libs/libQuotient/libQuotient-0.6.0.ebuild
index a44dfc5..c59f38c 100644
--- a/dev-libs/libQuotient/libQuotient-0.6.0.ebuild
+++ b/dev-libs/libQuotient/libQuotient-0.6.0.ebuild
@@ -10,9 +10,9 @@ inherit eutils cmake
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
+	EGIT_REPO_URI="https://github.com/quotient-im/"${PN}".git"
 else
-	SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz "
+	SRC_URI="https://github.com/quotient-im/libQuotient/archive/"${PV}".tar.gz -> "${P}".tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -28,7 +28,7 @@ DEPEND="
 	!!dev-libs/libqmatrixclient
 "
 
-S="${WORKDIR}/${PN}-${PV}"
+S=""${WORKDIR}"/"${PN}"-"${PV}""
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/libQuotient/libQuotient-0.6.1.ebuild b/dev-libs/libQuotient/libQuotient-0.6.1.ebuild
index a44dfc5..c59f38c 100644
--- a/dev-libs/libQuotient/libQuotient-0.6.1.ebuild
+++ b/dev-libs/libQuotient/libQuotient-0.6.1.ebuild
@@ -10,9 +10,9 @@ inherit eutils cmake
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
+	EGIT_REPO_URI="https://github.com/quotient-im/"${PN}".git"
 else
-	SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz "
+	SRC_URI="https://github.com/quotient-im/libQuotient/archive/"${PV}".tar.gz -> "${P}".tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -28,7 +28,7 @@ DEPEND="
 	!!dev-libs/libqmatrixclient
 "
 
-S="${WORKDIR}/${PN}-${PV}"
+S=""${WORKDIR}"/"${PN}"-"${PV}""
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/libQuotient/libQuotient-9999.ebuild b/dev-libs/libQuotient/libQuotient-9999.ebuild
index b595dde..c59f38c 100644
--- a/dev-libs/libQuotient/libQuotient-9999.ebuild
+++ b/dev-libs/libQuotient/libQuotient-9999.ebuild
@@ -8,13 +8,11 @@ HOMEPAGE="https://github.com/qmatrixclient/libqmatrixclient"
 
 inherit eutils cmake
 
-MY_PV="$(ver_rs 2 '-')"
-
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
+	EGIT_REPO_URI="https://github.com/quotient-im/"${PN}".git"
 else
-	SRC_URI="https://github.com/quotient-im/libQuotient/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/quotient-im/libQuotient/archive/"${PV}".tar.gz -> "${P}".tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -30,7 +28,7 @@ DEPEND="
 	!!dev-libs/libqmatrixclient
 "
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+S=""${WORKDIR}"/"${PN}"-"${PV}""
 
 src_configure() {
 	local mycmakeargs=(