diff --git a/srcpkgs/flac/libflac-devel.template b/srcpkgs/flac/libflac-devel.template
index b336c2e7a9c..8ac15940aff 100644
--- a/srcpkgs/flac/libflac-devel.template
+++ b/srcpkgs/flac/libflac-devel.template
@@ -1,15 +1,9 @@
 # Template file for 'libflac-devel'.
 #
-depends="libstdc++-devel libogg-devel libflac"
+depends="libstdc++-devel libogg-devel libflac>=${version}"
 short_desc="${short_desc} - development files"
-long_desc="${long_desc}
 
- This package contains files for development, headers, static libs, etc."
-
-
-
-do_install()
-{
+do_install() {
 	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
diff --git a/srcpkgs/flac/libflac.template b/srcpkgs/flac/libflac.template
index 01eb964d976..80c122710af 100644
--- a/srcpkgs/flac/libflac.template
+++ b/srcpkgs/flac/libflac.template
@@ -1,14 +1,8 @@
 # Template file for 'libflac'.
 #
 short_desc="${short_desc} - shared libraries"
-long_desc="${long_desc}
 
- This package contains the FLAC shared libraries."
-
-
-
-do_install()
-{
+do_install() {
 	mkdir -p ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib
 }
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 7c3d80693b3..b2142a64e20 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,30 +1,33 @@
 # Template file for 'flac'
 pkgname=flac
 version=1.2.1
-revision=5
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
+revision=6
+subpackages="libflac libflac-devel"
 build_style=gnu-configure
 configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin"
 makedepends="nasm libogg-devel"
 short_desc="Free Lossless Audio Codec"
 maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://flac.sourceforge.net/"
+license="BSD, GPL"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
 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)
-
-Free means that the specification of the stream format is in the public
-domain (the FLAC project reserves the right to set the FLAC specification
-and certify compliance), and that neither the FLAC format nor any of the
-implemented encoding/decoding methods are covered by any patent. It also
-means that the source for libFLAC is available under the LGPL and the
-sources for flac and the plugins are available under the GPL."
- 
-subpackages="libflac libflac-devel"
+    works)"
 
+if [ -n "$XBPS_CROSS_BUILD" ]; then
+	makedepends="automake pkg-config"
+	crossmakedepends="libogg-devel"
+	pre_configure() {
+		./autogen.sh
+	}
+	configure_args="${configure_args} --with-ogg=$XBPS_CROSS_BASE"
+fi