diff --git a/srcpkgs/flac/patches/autogen_skip_configure.patch b/srcpkgs/flac/patches/autogen_skip_configure.patch
new file mode 100644
index 00000000000..3f2ecc134b3
--- /dev/null
+++ b/srcpkgs/flac/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/flac/patches/configure-fixes.patch b/srcpkgs/flac/patches/configure-fixes.patch
new file mode 100644
index 00000000000..217546a70a1
--- /dev/null
+++ b/srcpkgs/flac/patches/configure-fixes.patch
@@ -0,0 +1,22 @@
+--- 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")