diff --git a/gui-apps/clipman/clipman-1.6.2.ebuild b/gui-apps/clipman/clipman-1.6.2.ebuild
index dcd07c6e44..fc81418ff1 100644
--- a/gui-apps/clipman/clipman-1.6.2.ebuild
+++ b/gui-apps/clipman/clipman-1.6.2.ebuild
@@ -6,8 +6,8 @@ EAPI=8
 inherit go-module
 
 DESCRIPTION="A basic clipboard manager for Wayland."
-HOMEPAGE="https://github.com/yory8/clipman"
-SRC_URI="https://github.com/yory8/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/chmouel/clipman/"
+SRC_URI="https://github.com/chmouel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 # Using a dependency tarball as per https://devmanual.gentoo.org/eclass-reference/go-module.eclass/index.html
 DEPS_URI="https://kdrive.infomaniak.com/2/app/192129/share/901d89f7-3efa-4922-a7ee-550314e02a8e/files/21/download -> ${P}-deps.tar.xz"
@@ -22,10 +22,6 @@ DEPEND="
 	>=gui-apps/wl-clipboard-2
 	gui-libs/wlroots
 "
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-lang/go
-"
 
 src_compile() {
 	ego build .
diff --git a/gui-apps/clipman/metadata.xml b/gui-apps/clipman/metadata.xml
index e63be183c4..176487775f 100644
--- a/gui-apps/clipman/metadata.xml
+++ b/gui-apps/clipman/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Jonas Frei</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">yory8/clipman</remote-id>
-		<bugs-to>https://github.com/yory8/clipman/issues</bugs-to>
+		<remote-id type="github">chmouel/clipman</remote-id>
+		<bugs-to>https://github.com/chmouel/clipman/issues</bugs-to>
 	</upstream>
 </pkgmetadata>