diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 3a86424f4f..46b55140b2 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,12 +1,10 @@
 # Template file for 'flac'
 pkgname=flac
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin"
-if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	hostmakedepends="nasm"
-fi
+configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin --with-ogg=${XBPS_CROSS_BASE}/usr"
+hostmakedepends="automake pkg-config libtool nasm"
 makedepends="libogg-devel"
 short_desc="Free Lossless Audio Codec"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -14,38 +12,25 @@ homepage="http://flac.sourceforge.net/"
 license="BSD, GPL"
 distfiles="http://downloads.xiph.org/releases/flac/flac-${version}.tar.xz"
 checksum=fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc
-long_desc="
- FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC is
- similar to MP3, but lossless. The FLAC project consists of:
 
-  * the stream format
-  * libFLAC, which implements reference encoders and decoders
-  * flac, a command-line wrapper around libFLAC to encode and decode .flac
-    files
-  * input plugins for various music players (Winamp, XMMS, and more in the
-    works)"
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="automake pkg-config libtool"
-	pre_configure() {
-		autoreconf -fi
-	}
-	configure_args+=" --with-ogg=$XBPS_CROSS_BASE"
-fi
+pre_configure() {
+	autoreconf -fi
+}
 
 libflac_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {
-		vmove "usr/lib/*.so*"
+		vmove "usr/lib/*.so.*"
 	}
 }
 
 libflac-devel_package() {
-	depends="libstdc++-devel libogg-devel libflac>=${version}"
+	depends="libstdc++-devel libogg-devel libflac>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		vmove usr/share/aclocal
 		vmove usr/share/doc
 	}