diff --git a/media-libs/flac/flac-1.2.1.bep b/media-libs/flac/flac-1.2.1.bep
index 21f69bcc4..7bc6a09d0 100644
--- a/media-libs/flac/flac-1.2.1.bep
+++ b/media-libs/flac/flac-1.2.1.bep
@@ -7,12 +7,15 @@ 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
-	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
+	aclocal -I m4
 	./autogen.sh --prefix=`finddir B_COMMON_DIRECTORY` \
-		--libdir=$LIBDIR \
-		--mandir=$MANDIR
+		--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
+		--docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/flac \
+		--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
+		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	make
 
 }