diff --git a/media-libs/plotutils/plotutils-2.6.recipe b/media-libs/plotutils/plotutils-2.6.recipe
index 6fdf1966a..cf4faf60a 100644
--- a/media-libs/plotutils/plotutils-2.6.recipe
+++ b/media-libs/plotutils/plotutils-2.6.recipe
@@ -5,7 +5,7 @@ X Window System."
 HOMEPAGE="https://www.gnu.org/software/plotutils/"
 COPYRIGHT="1995, 1996, 1997, 1998, 1999, 2000, 2005, 2008, Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/plotutils/plotutils-$portVersion.tar.gz
 	https://ftpmirror.gnu.org/plotutils/plotutils-$portVersion.tar.gz
 	http://ftp.hosteurope.de/mirror/ftp.gnu.org/gnu/plotutils/plotutils-$portVersion.tar.gz
@@ -16,6 +16,13 @@ PATCHES="plotutils-$portVersion.patchset"
 ARCHITECTURES="all ?x86_gcc2 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
 
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
@@ -31,14 +38,14 @@ REQUIRES="
 
 PROVIDES_tools="
 	plotutils${secondaryArchSuffix}_tools = $portVersion
-	cmd:double = $portVersion
-	cmd:graph = $portVersion
-	cmd:hersheydemo = $portVersion
-	cmd:ode = $portVersion
-	cmd:plot = $portVersion
-	cmd:plotfont = $portVersion
-	cmd:spline = $portVersion
-	cmd:tek2plot = $portVersion
+	cmd:double$commandSuffix = $portVersion
+	cmd:graph$commandSuffix = $portVersion
+	cmd:hersheydemo$commandSuffix = $portVersion
+	cmd:ode$commandSuffix = $portVersion
+	cmd:plot$commandSuffix = $portVersion
+	cmd:plotfont$commandSuffix = $portVersion
+	cmd:spline$commandSuffix = $portVersion
+	cmd:tek2plot$commandSuffix = $portVersion
 	"
 REQUIRES_tools="
 	haiku$secondaryArchSuffix
@@ -68,7 +75,7 @@ BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix >= 2.4.2
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	"
 
@@ -76,7 +83,9 @@ BUILD()
 {
 	libtoolize --force --copy --install
 	autoreconf -i
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure \
+			--bindir=$commandBinDir \
+			--disable-static
 	make $jobArgs
 }
 
@@ -86,11 +95,13 @@ INSTALL()
 
 	rm $libDir/libplot*.la
 
-	prepareInstalledDevelLibs libplot
+	prepareInstalledDevelLib libplot
 	fixPkgconfig
 
 	# tools package
-	packageEntries tools $binDir
+	packageEntries tools $commandBinDir \
+		$dataDir \
+		$documentationDir
 
 	# devel package
 	packageEntries devel \