diff --git a/media-sound/picard/additional-files/picard.rdef.in b/media-sound/picard/additional-files/picard.rdef.in
index 4f09c876c..59fcaf3b0 100644
--- a/media-sound/picard/additional-files/picard.rdef.in
+++ b/media-sound/picard/additional-files/picard.rdef.in
@@ -16,11 +16,11 @@ resource app_version {
 
 resource vector_icon array {
 	$"6E6369660B0500020006023C71A33D763DBE755C3D789749C3F347CCC000AB26"
-	$"BFFF791A88020006043CE650B990C43A7F633E07FC48D54D42FCF400C92BE475"
+	$"BFFF791A88020006043CE650B990C43A7F633E07FC48D54D42FCF400C92BE47B"
 	$"AB26BF7DFF8D57FFEB743B020006023C318B3A487CBD09B43EEB2D4B485C4817"
-	$"6F00EB743BFFC4582D04016D03EB733B03771B8503B66BC2020006043A00963A"
+	$"6F00EB743BFFC4582D04016D03EB743B03771B8503B66BC2020006043A00963A"
 	$"995DBAFB5C3A4C154AC55C47FBE600FFFEDB81F9F8D683E2E2C1FFE3E3C20201"
-	$"1602B8C5A9BD34AD3DFE93B97440475A124A0DC100F6FFDB03BDACA4150A0622"
+	$"1602B8C5A9BD34AD3DFE93B97440475A124A0DC100F6FFF603D2C2BB150A0622"
 	$"31224E3E5C5248522D37260A042231224E3E5C3E3A0A0422313E3A522D37260A"
 	$"043E5C5248522D3E3A0A043E5E4E5E604854440A06BB44BA46B83BBBBC29C496"
 	$"B97CC3DABBEDC594BD92BCBB020CBF3FB9C1BF3FB9C1BF37B9BFBF25B9BBBF2E"
@@ -82,12 +82,15 @@ resource vector_icon array {
 	$"C1E4C267C1FFC23CC1D3C281C197C292C1B6C292C185C292C166C284C175C28D"
 	$"C13BC2690207C36AC464C34FC48EC371C458C386C447C37BC44EC395C43EC3B7"
 	$"C439C3A6C439C3C8C439C3E7C446C3D9C43DC412C461C405C4C4C420C499C3F4"
-	$"C4DFC3B8C4EFC3D7C4EFC3A7C4F0C387C4E2C396C4EBC35CC4C70A06BBEDB57D"
-	$"BD9B393E3ABFD9BCBCBCA3B55DBC30B52D0A043BBD0FBDC5CA453E5C3E3A0A04"
-	$"3E5CBFBCCA2B4039BEE7BD82120A040104000A0001001001178400040A010101"
-	$"000A020102000A030103000A0401050A3FF638BA34BA3A34BA3FF638C5A6E244"
-	$"614320FF0A040106281C2220FF0A070105281C2118FF0A080106281C2118FF0A"
-	$"06010728B174B38218FF0A04010828202120FF0A080308090A0818FF0A040028"
-	$"202120FF0A08040B0C0D0E0818FF0A04002820B38C20FF0A08030F10110818FF"
-	$"0A09021213000A0A011400"
+	$"C4DFC3B8C4EFC3D7C4EFC3A7C4F0C387C4E2C396C4EBC35CC4C70A0637263D3A"
+	$"3E3A3F3A3826BC30B52D0A043D3A3D5C3E5C3E3A08043E5C3F5B3F3ABEE7BD82"
+	$"120A040104000A0001001001178400040A010101000A020102000A030103000A"
+	$"0401050A3FCAEFB6D7B636FB0D3F9DF6C4928244187020FF0A040106281B2020"
+	$"FF0A0701050A3FC6523927F6B98AE73FDA8138A0A2C2F68818FF0A0801060A3F"
+	$"B863000000000000400000C2D994C0000018FF0A0601070A4000000000000000"
+	$"00400000C3E000BEE00418FF0A0401080A3F710D38D8A7B8AE453F3DCD439416"
+	$"BD211720FF0A080308090A0A3F710D38D8A7B8AE453F3DCD43A989C0672C18FF"
+	$"0A040028202120FF0A08040B0C0D0E281E1E18FF0A04002820B38C20FF0A0803"
+	$"0F10110A3FF81839F7C5B9F7C53FF818444594C5359218FF0A09021312000A0A"
+	$"011400"
 };
diff --git a/media-sound/picard/picard-2.1.3.recipe b/media-sound/picard/picard-2.1.3.recipe
index 0e287b81d..a44218755 100644
--- a/media-sound/picard/picard-2.1.3.recipe
+++ b/media-sound/picard/picard-2.1.3.recipe
@@ -4,35 +4,37 @@ HOMEPAGE="https://picard.musicbrainz.org/"
 COPYRIGHT="2004-2019 Robert Kaye, Lukas Lalinsky, Laurent Monin, \
 Sambhav Kothari, Philipp Wolfer and others"
 LICENSE="GNU GPL v2"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="ftp://ftp.eu.metabrainz.org/pub/musicbrainz/picard/picard-$portVersion.tar.gz"
 CHECKSUM_SHA256="8e044fe68c44d345c19f98952c3c7f20c72da74dbac9ce7c7b0621e2d69885a7"
 SOURCE_DIR="picard-release-$portVersion"
 PATCHES="picard-$portVersion.patchset"
 ADDITIONAL_FILES="picard.rdef.in"
 
-ARCHITECTURES="x86 x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	picard = $portVersion
-	cmd:picard = $portVersion
+	picard$secondaryArchSuffix = $portVersion
+	app:Picard = $portVersion
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
+	lib:libdiscid$secondaryArchSuffix
 	cmd:python3.6
 	pyqt_python3
 	mutagen_python36
 	discid_python36
-	cmd:fpcalc
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	cmd:gcc
-	cmd:msgfmt
-	cmd:python3.6
+	haiku${secondaryArchSuffix}_devel
 	setuptools_python36
-	pyqt_python3
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:msgfmt$secondaryArchSuffix
+	cmd:python3.6
 	"
 
 BUILD()
@@ -51,7 +53,7 @@ INSTALL()
 		--disable-autoupdate
 
 	mkdir -p $appsDir
-	mv $binDir/picard $appsDir/Picard
+	mv $prefix/bin/picard $appsDir/Picard
 	rm -rf $binDir
 
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"