diff --git a/media-libs/flac/flac-1.2.1.recipe b/media-libs/flac/flac-1.2.1.recipe
deleted file mode 100644
index df7717403..000000000
--- a/media-libs/flac/flac-1.2.1.recipe
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION="flac - Free Lossless Audio Codec" 
-HOMEPAGE="http://flac.sourceforge.net/" 
-SRC_URI="http://downloads.sourceforge.net/project/flac/flac-src/flac-1.2.1-src/flac-1.2.1.tar.gz"
-CHECKSUM_MD5="153c8b15a54da428d1f0fadc756c22c7"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="gettext >= 0.17"
-BUILD()
-{
-	cd flac-1.2.1
-	haikuporter -b libiconv-1.13.1
-	cp -a `haikuporter -t`/dev-libs/libiconv/work/libiconv-1.13.1/srcm4/. m4
-	libtoolize --force --copy --install
-	aclocal -I m4
-	autoconf
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	sed -i 's/m4datadir = $(datadir)\/aclocal/m4datadir = `finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' src/libFLAC/M*
-	sed -i 's/m4datadir = $(datadir)\/aclocal/m4datadir = `finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' src/libFLAC++/M*
-	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datarootdir=$COMMON_DOCS \
-		--docdir=$COMMON_DOCS/doc/flac \
-		--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
-		--mandir=$COMMON_DOCS/man
-	make
-}
-
-INSTALL()
-{
-	cd flac-1.2.1
-	make install
-}
-
-LICENSE="GNU LGPL v2.1
-	GNU GPL v2
-	BSD (3-clause)"
-COPYRIGHT="2000-2007 Josh Coalson"
diff --git a/media-libs/flac/flac-1.3.0.recipe b/media-libs/flac/flac-1.3.0.recipe
new file mode 100644
index 000000000..c434d147a
--- /dev/null
+++ b/media-libs/flac/flac-1.3.0.recipe
@@ -0,0 +1,93 @@
+SUMMARY="flac - Free Lossless Audio Codec"
+DESCRIPTION="FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless, meaning that audio is compressed in FLAC without any loss in quality.  This is similar to how Zip works, except with FLAC you will get much better compression because it is designed specifically for audio, and you can play back compressed FLAC files in your favorite player (or your car or home stereo) just like you would an MP3 file." 
+HOMEPAGE="http://flac.sourceforge.net/" 
+SRC_URI="http://downloads.xiph.org/releases/flac/flac-1.3.0.tar.xz"
+CHECKSUM_MD5="13b5c214cee8373464d3d65dee362cdd"
+REVISION="1"
+
+LICENSE="GNU LGPL v2.1
+	GNU GPL v2
+	BSD (3-clause)
+	"
+	
+COPYRIGHT="2000-2007 Josh Coalson"
+
+ARCHITECTURES="x86 x86_gcc2"
+
+PROVIDES="
+	libFLAC = 1.3.0 compat >= 1
+	cmd:flac
+	cmd:metaflac 
+	lib:libFLAC++
+	lib:libFLAC
+	"
+	
+REQUIRES="
+	haiku
+	lib:libiconv
+	"
+	
+BUILD_REQUIRES="
+	"
+	
+BUILD_PREREQUIRES="
+	haiku_devel
+	cmd:gcc
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:ld
+	cmd:make
+	cmd:gawk
+	cmd:perl
+	devel:libiconv
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+		
+	prepareInstalledDevelLibs libFLAC
+	fixPkgconfig
+	
+	# devel package
+	packageEntries devel \
+		$developDir
+
+}
+
+TEST()
+{
+	test_grabbag.sh
+	test_streams.sh
+	test_libFLAC.sh
+	test_wrapper.sh
+	test_bins.sh
+	test_libFLAC++.sh
+	test_compression.sh
+	test_metaflac.sh
+	test_flac.sh
+	test_seeking.sh
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libFLAC_devel = $portVersion
+	devel:libFLAC = 8.3.0 compat >= 8
+	devel:libFLAC++ = 8.3.0 compat >= 8
+	"
+
+REQUIRES_devel="
+	libFLAC == $portVersion
+	"
diff --git a/media-libs/flac/patches/flac-1.2.1.patch b/media-libs/flac/patches/flac-1.2.1.patch
deleted file mode 100644
index be91dfc97..000000000
--- a/media-libs/flac/patches/flac-1.2.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN flac-1.2.1/examples/cpp/encode/file/main.cpp flac-1.2.1-haiku/examples/cpp/encode/file/main.cpp
---- flac-1.2.1/examples/cpp/encode/file/main.cpp	2007-09-13 15:58:03.004718592 +0000
-+++ flac-1.2.1-haiku/examples/cpp/encode/file/main.cpp	2010-09-20 12:47:33.520617984 +0000
-@@ -30,6 +30,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "FLAC++/metadata.h"
- #include "FLAC++/encoder.h"
-