diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe b/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe
index a5d746941..bb7fc57cd 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe
+++ b/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe
@@ -2,29 +2,31 @@ SUMMARY="Proj.4 cartographic projection software"
 DESCRIPTION="Proj.4 is a library for performing conversions between \
 cartographic projections."
 HOMEPAGE="http://trac.osgeo.org/geotiff/"
+COPYRIGHT="1999-2012 Frank Warmerdam"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
+SOURCE_URI="http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-$portVersion.tar.gz"
+CHECKSUM_SHA256="d0acb8d341fd6a8f2c673456e09fdb8f50f91e3166ac934719fe05b30d328329"
+PATCHES="libgeotiff-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
+SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
-if [ $targetArchitecture != x86_gcc2 ]; then
+if [ "$targetArchitecture" != x86_gcc2 ]; then
+	commandSuffix=$secondaryArchSuffix
+	commandBinDir=$binDir
+else
 	commandSuffix=
 	commandBinDir=$prefix/bin
 fi
 
-SOURCE_URI="http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-$portVersion.tar.gz"
-CHECKSUM_SHA256="d0acb8d341fd6a8f2c673456e09fdb8f50f91e3166ac934719fe05b30d328329"
-COPYRIGHT="2000 Frank Warmerdam"
-PATCHES="libgeotiff-$portVersion.patchset"
-
 PROVIDES="
 	libgeotiff$secondaryArchSuffix = $portVersion compat >= 1
 	lib:libgeotiff$secondaryArchSuffix = 2.1.0 compat >= 2.1
-	cmd:applygeo
-	cmd:geotifcp
-	cmd:listgeo
-	cmd:makegeo
+	cmd:applygeo$commandSuffix
+	cmd:geotifcp$commandSuffix
+	cmd:listgeo$commandSuffix
+	cmd:makegeo$commandSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -33,6 +35,7 @@ REQUIRES="
 	lib:libjpeg$secondaryArchSuffix
 	lib:libproj$secondaryArchSuffix
 	"
+
 PROVIDES_devel="
 	libgeotiff${secondaryArchSuffix}_devel = $portVersion compat >= 1
 	devel:libgeotiff$secondaryArchSuffix = 2.1.0 compat >= 2.1
@@ -40,6 +43,7 @@ PROVIDES_devel="
 REQUIRES_devel="
 	libgeotiff$secondaryArchSuffix == $portVersion base
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix
@@ -51,7 +55,7 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:autoreconf
 	cmd:aclocal
-	cmd:libtoolize
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
@@ -64,7 +68,8 @@ BUILD()
 	jpegDir=$portPackageLinksDir/lib~libjpeg
 	zlibDir=$portPackageLinksDir/lib~libz
 	autoreconf -fi
-	runConfigure ./configure --with-zlib=$zlibDir \
+	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir \
+		--with-zlib=$zlibDir \
 		--with-jpeg=$jpegDir
 	make $jobArgs
 }
@@ -78,6 +83,5 @@ INSTALL()
 
 	# devel package
 	packageEntries devel \
-		$developDir \
-		$manDir/man1
+		$developDir
 }