diff --git a/srcpkgs/flac/patches/autogen_skip_configure.patch b/srcpkgs/flac/patches/autogen_skip_configure.patch
deleted file mode 100644
index 3f2ecc134b3..00000000000
--- a/srcpkgs/flac/patches/autogen_skip_configure.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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/flac/patches/configure-fixes.patch b/srcpkgs/flac/patches/configure-fixes.patch
deleted file mode 100644
index 217546a70a1..00000000000
--- a/srcpkgs/flac/patches/configure-fixes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.in.orig	2013-03-21 17:43:57.269562981 +0100
-+++ configure.in	2013-03-21 17:44:23.956687605 +0100
-@@ -44,7 +44,7 @@ AC_FUNC_FSEEKO
- AC_CHECK_SIZEOF(void*,0)
- 
- #@@@ new name is AC_CONFIG_HEADERS
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- AC_C_BIGENDIAN
- 
-@@ -256,8 +256,8 @@ AH_TEMPLATE(FLAC__HAS_OGG, [define if yo
- fi
- 
- dnl check for i18n(internationalization); these are from libiconv/gettext
--AM_ICONV
--AM_LANGINFO_CODESET
-+AC_DEFINE([HAVE_ICONV], [], [Whether we have libiconv available]) LIBICONV=""
-+AC_SUBST(LIBICONV)
- 
- AC_CHECK_PROGS(DOCBOOK_TO_MAN, docbook-to-man docbook2man)
- AM_CONDITIONAL(FLaC__HAS_DOCBOOK_TO_MAN, test -n "$DOCBOOK_TO_MAN")
diff --git a/srcpkgs/flac/patches/flac-1.2.1-gcc-4.3-includes.patch b/srcpkgs/flac/patches/flac-1.2.1-gcc-4.3-includes.patch
deleted file mode 100644
index 5798204c00a..00000000000
--- a/srcpkgs/flac/patches/flac-1.2.1-gcc-4.3-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- examples/cpp/encode/file/main.cpp	2007-09-13 09:58:03.000000000 -0600
-+++ examples/cpp/encode/file/main.cpp	2007-11-18 12:59:45.000000000 -0600
-@@ -30,6 +30,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <cstring>
- #include "FLAC++/metadata.h"
- #include "FLAC++/encoder.h"
- 
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 23b59ae35d7..8f3fc7297e2 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
 # Template file for 'flac'
 pkgname=flac
-version=1.2.1
-revision=6
+version=1.3.0
+revision=1
 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
@@ -12,8 +12,8 @@ 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
+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:
@@ -26,15 +26,15 @@ long_desc="
     works)"
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="automake pkg-config"
+	hostmakedepends="automake pkg-config libtool"
 	pre_configure() {
-		./autogen.sh
+		autoreconf -fi
 	}
 	configure_args+=" --with-ogg=$XBPS_CROSS_BASE"
 fi
 
 libflac_package() {
-	short_desc="${short_desc} - shared libraries"
+	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so*"
 	}
@@ -42,11 +42,10 @@ libflac_package() {
 
 libflac-devel_package() {
 	depends="libstdc++-devel libogg-devel libflac>=${version}"
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
 		vmove usr/share/aclocal
 		vmove usr/share/doc
 	}