diff --git a/media-gfx/admesh/admesh-0.98.5.recipe b/media-gfx/admesh/admesh-0.98.5.recipe
index cb4509397..9fef94ded 100644
--- a/media-gfx/admesh/admesh-0.98.5.recipe
+++ b/media-gfx/admesh/admesh-0.98.5.recipe
@@ -7,7 +7,7 @@ Anthony Martin’s Masters Thesis."
 HOMEPAGE="https://admesh.readthedocs.io/"
 COPYRIGHT="Anthony D. Martin"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/admesh/admesh/releases/download/v$portVersion/admesh-$portVersion.tar.gz"
 CHECKSUM_SHA256="0d7994bfa587c4e958b2ac7c7d2fb90dfb6c5463d32513ada169cf710a438535"
 PATCHES="admesh-$portVersion.patchset"
@@ -15,10 +15,20 @@ PATCHES="admesh-$portVersion.patchset"
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="1.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	admesh$secondaryArchSuffix = $portVersion
-	cmd:admesh$secondaryArchSuffix = $portVersion
-	lib:libadmesh$secondaryArchSuffix = $portVersion
+	cmd:admesh$commandSuffix = $portVersion
+	lib:libadmesh$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -26,11 +36,10 @@ REQUIRES="
 
 PROVIDES_devel="
 	admesh${secondaryArchSuffix}_devel = $portVersion
-	devel:libadmesh$secondaryArchSuffix = $portVersion
+	devel:libadmesh$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	admesh$secondaryArchSuffix == $portVersion base
-	haiku${secondaryArchSuffix}_devel
 	"
 
 BUILD_REQUIRES="
@@ -45,7 +54,8 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	autoconf -i
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure \
+			--bindir=$commandBinDir
 	make $jobArgs
 }
 
@@ -55,10 +65,9 @@ INSTALL()
 
 	rm $libDir/*.la
 
+	prepareInstalledDevelLib libadmesh
 	fixPkgconfig
 
-	prepareInstalledDevelLibs \
-		libadmesh
 	packageEntries devel \
 		$developDir
 }