diff --git a/media-libs/rubberband/rubberband-1.8.1.recipe b/media-libs/rubberband/rubberband-1.8.1.recipe
index f57b681bd..214b9545a 100644
--- a/media-libs/rubberband/rubberband-1.8.1.recipe
+++ b/media-libs/rubberband/rubberband-1.8.1.recipe
@@ -13,6 +13,12 @@ PATCHES="rubberband-$portVersion.patchset"
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+if [ "$targetArchitecture" != x86_gcc2 ]; then
+	commandBinDir=$binDir
+else
+	commandBinDir=$prefix/bin
+fi
+
 PROVIDES="
 	rubberband$secondaryArchSuffix = $portVersion
 	cmd:rubberband
@@ -53,10 +59,19 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+PATCH()
+{
+	sed -i \
+		-e "/^INSTALL_INCDIR/ s|\(@prefix@/\)include/|\1$relativeIncludeDir/|;" \
+		-e "/^INSTALL_LRDFDIR/ s|\(@prefix@/\)share/|\1$relativeDataDir/|;" \
+		-e "/^INSTALL_/ s|\(@prefix@/\)lib|\1$relativeLibDir|;" \
+		Makefile.in
+}
+
 BUILD()
 {
 	autoreconf -fi
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
 	make $jobArgs
 }
 
@@ -64,10 +79,6 @@ INSTALL()
 {
 	make install
 
-	mkdir -p $(dirname $includeDir) $dataDir
-	mv $prefix/include $includeDir
-	mv $prefix/share/ladspa $dataDir
-
 	prepareInstalledDevelLibs librubberband
 	fixPkgconfig
 
@@ -78,5 +89,5 @@ INSTALL()
 
 TEST()
 {
-	make check
+	bin/rubberband --version
 }