diff --git a/media-sound/picard/metadata.xml b/media-sound/picard/metadata.xml
index 7f4ecbe5ec563..29bce0b3bacf0 100644
--- a/media-sound/picard/metadata.xml
+++ b/media-sound/picard/metadata.xml
@@ -5,6 +5,9 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">metabrainz/picard</remote-id>
+	</upstream>
 	<longdescription>MusicBrainz Picard is a cross-platform MusicBrainz tag editor
 		written in Python. Picard Tagger is intended to be the next generation of
 		tagger for MusicBrainz, with a focus on album oriented tagging as opposed to
diff --git a/media-sound/picard/picard-3.0_pre20251102.ebuild b/media-sound/picard/picard-3.0_pre20251102.ebuild
index 2a55e7189d5da..86459ef76f6f7 100644
--- a/media-sound/picard/picard-3.0_pre20251102.ebuild
+++ b/media-sound/picard/picard-3.0_pre20251102.ebuild
@@ -17,6 +17,7 @@ else
 	if [[ ${PV} == *_p* ]]; then
 		COMMIT="45c664e331d5f392f45f80dccb5fc844737a614a"
 		SRC_URI="https://github.com/metabrainz/${PN}/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT:0:8}.tar.gz"
+		S="${WORKDIR}/${PN}-${COMMIT}"
 	else
 		SRC_URI="https://data.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 	fi
diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild
index 2a55e7189d5da..86459ef76f6f7 100644
--- a/media-sound/picard/picard-9999.ebuild
+++ b/media-sound/picard/picard-9999.ebuild
@@ -17,6 +17,7 @@ else
 	if [[ ${PV} == *_p* ]]; then
 		COMMIT="45c664e331d5f392f45f80dccb5fc844737a614a"
 		SRC_URI="https://github.com/metabrainz/${PN}/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT:0:8}.tar.gz"
+		S="${WORKDIR}/${PN}-${COMMIT}"
 	else
 		SRC_URI="https://data.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 	fi