diff --git a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
index dec570375..55306af92 100644
--- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
+++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
@@ -4,71 +4,67 @@ vorbis-tools - tools for using the Ogg Vorbis sound file format."
 HOMEPAGE="http://www.vorbis.com/"
 COPYRIGHT="2000-2005 Michael Smith, Stan Seibert and other contributers"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz"
 CHECKSUM_SHA256="a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc"
 SOURCE_DIR="vorbis-tools-$portVersion"
 PATCHES="vorbis_tools-1.4.0.patch"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	vorbis_tools = $portVersion compat >= 1
-	cmd:oggenc$secondaryArchSuffix
-	cmd:oggdec$secondaryArchSuffix
-	cmd:ogginfo$secondaryArchSuffix
-	cmd:vcut$secondaryArchSuffix
-	cmd:vorbiscomment$secondaryArchSuffix
-	cmd:ogg123$secondaryArchSuffix
+	cmd:oggenc
+	cmd:oggdec
+	cmd:ogginfo
+	cmd:vcut
+	cmd:vorbiscomment
+	cmd:ogg123
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libvorbis$secondaryArchSuffix
-	lib:libFLAC$secondaryArchSuffix
-	lib:libspeex$secondaryArchSuffix
-	lib:libao$secondaryArchSuffix
-	lib:libogg$secondaryArchSuffix
-	lib:libvorbis$secondaryArchSuffix
-	lib:libcurl$secondaryArchSuffix
-	lib:libvorbisfile$secondaryArchSuffix
-	lib:libvorbisenc$secondaryArchSuffix
-	lib:libssl$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
+	haiku
+	lib:libvorbis
+	lib:libFLAC
+	lib:libspeex
+	lib:libao
+	lib:libogg
+	lib:libvorbis
+	lib:libcurl
+	lib:libvorbisfile
+	lib:libvorbisenc
+	lib:libssl
+	lib:libz
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libvorbis$secondaryArchSuffix
-	devel:libFLAC$secondaryArchSuffix
-	devel:libspeex$secondaryArchSuffix
-	devel:libao$secondaryArchSuffix
-	devel:libogg$secondaryArchSuffix
-	devel:libvorbis$secondaryArchSuffix
-	devel:libcurl$secondaryArchSuffix
-	devel:libvorbisfile$secondaryArchSuffix
-	devel:libvorbisenc$secondaryArchSuffix
-	devel:libssl$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
+	haiku_devel
+	devel:libvorbis
+	devel:libFLAC
+	devel:libspeex
+	devel:libao
+	devel:libogg
+	devel:libvorbis
+	devel:libcurl
+	devel:libvorbisfile
+	devel:libvorbisenc
+	devel:libssl
+	devel:libz
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
+	cmd:gcc
+	cmd:ld
 	cmd:libtoolize
 	cmd:aclocal
-	cmd:autoconf
+	cmd:autoreconf
 	cmd:automake
 	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
+	cmd:pkg_config
 	"
 
 BUILD()
 {
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
-	libtoolize --force --copy --install
-	aclocal -I m4
-	automake
-	autoconf
+	autoreconf -fi
 	runConfigure ./configure
 	make $jobArgs
 }
@@ -76,4 +72,5 @@ BUILD()
 INSTALL()
 {
 	make install
+	rm $prefix/lib
 }