diff --git a/srcpkgs/libvorbis/libvorbis-devel.template b/srcpkgs/libvorbis/libvorbis-devel.template
index 155b2bb5d3..a9ab041b7a 100644
--- a/srcpkgs/libvorbis/libvorbis-devel.template
+++ b/srcpkgs/libvorbis/libvorbis-devel.template
@@ -1,14 +1,9 @@
 # Template file for 'libvorbis-devel'.
 #
-depends="libogg-devel libvorbis"
-short_desc="${sourcepkg} development files"
-long_desc="${long_desc}
+depends="libogg-devel libvorbis>=${version}"
+short_desc="${short_desc} - development files"
 
- This package contains files for development, headers, static libs, etc."
-
-
-do_install()
-{
+do_install() {
 	mkdir -p ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
diff --git a/srcpkgs/libvorbis/patches/autogen_skip_configure.patch b/srcpkgs/libvorbis/patches/autogen_skip_configure.patch
new file mode 100644
index 0000000000..3f2ecc134b
--- /dev/null
+++ b/srcpkgs/libvorbis/patches/autogen_skip_configure.patch
@@ -0,0 +1,9 @@
+--- autogen.sh.orig	2013-03-21 17:21:18.281013739 +0100
++++ autogen.sh	2013-03-21 17:21:23.960040231 +0100
+@@ -124,6 +124,3 @@ echo "  $AUTOMAKE --add-missing $AUTOMAK
+ $AUTOMAKE --add-missing $AUTOMAKE_FLAGS || exit 1
+ echo "  autoconf"
+ autoconf || exit 1
+-
+-cd $olddir
+-$srcdir/configure --enable-maintainer-mode "$@" && echo
diff --git a/srcpkgs/libvorbis/template b/srcpkgs/libvorbis/template
index 69f29acb9a..168c6eabc4 100644
--- a/srcpkgs/libvorbis/template
+++ b/srcpkgs/libvorbis/template
@@ -1,14 +1,15 @@
 # Template file for 'libvorbis'.
 pkgname=libvorbis
 version=1.3.3
-homepage="http://www.xiph.org/vorbis/"
-distfiles="http://downloads.xiph.org/releases/vorbis/${pkgname}-${version}.tar.gz"
+revision=2
 build_style=gnu-configure
+subpackages="$pkgname-devel"
 makedepends="pkg-config libogg-devel"
-revision=1
 short_desc="The Vorbis General Audio Compression Codec"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
+homepage="http://www.xiph.org/vorbis/"
+distfiles="http://downloads.xiph.org/releases/vorbis/${pkgname}-${version}.tar.gz"
 checksum=6d747efe7ac4ad249bf711527882cef79fb61d9194c45b5ca5498aa60f290762
 long_desc="
  Ogg Vorbis is a fully open, non-proprietary, patent- and royalty-free,
@@ -18,4 +19,11 @@ long_desc="
  The libvorbis package contains runtime libraries for use in programs
  that support Ogg Vorbis."
 
-subpackages="$pkgname-devel"
+if [ -n "$XBPS_CROSS_BUILD" ]; then
+	makedepends="automake pkg-config"
+	crossmakedepends="libogg-devel"
+	pre_configure() {
+		sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac
+		./autogen.sh
+	}
+fi