diff --git a/media-libs/libao/libao-1.0.0.bep b/media-libs/libao/libao-1.0.0.bep
new file mode 100644
index 000000000..ace0ecfeb
--- /dev/null
+++ b/media-libs/libao/libao-1.0.0.bep
@@ -0,0 +1,33 @@
+DESCRIPTION="Libao is a cross-platform audio library" 
+HOMEPAGE="http://xiph.org/ao/" 
+SRC_URI="http://downloads.xiph.org/releases/ao/libao-1.0.0.tar.gz"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+CHECKSUM_MD5="08283fbe1f587619053a156254afecec"
+BUILD {
+	cd libao-1.0.0
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake
+	./configure --prefix=/boot/common
+	make
+}
+
+INSTALL {
+	cd libao-1.0.0
+	make install
+}
+LICENSE="GNU GPL v2"
+COPYRIGHT="1999 Aaron Holtzman
+	2000 Rik Hemsley
+	2000 Timothy J. Wood
+	2000-2001 Stan Seibert
+	2001 Christian Weisgerber
+	2001 Wil Mahan
+	2002 Stefan Tibus
+	2008 Alexandre Ratchov
+	2008-2010 Philipp 'ph3-der-loewe' Schafft
+	2010 2010 Monty"
+	 
diff --git a/media-libs/libao/libao.OptionalPackageDescription b/media-libs/libao/libao.OptionalPackageDescription
deleted file mode 100644
index e11b3f1d9..000000000
--- a/media-libs/libao/libao.OptionalPackageDescription
+++ /dev/null
@@ -1,9 +0,0 @@
-Package:	libvorbis
-Version:	1.2.3
-Copyright:	1999 Aaron Holtzman
-Copyright:	2000 Jack Moffitt
-Copyright:	2000-2004 Stan Seibert
-Copyright:	2004-2006 Lennart Poettering
-Copyright:	2004-2005 Xiph.org Foundation 
-License:	GNU GPL v2
-URL:	http://www.xiph.org/
diff --git a/media-libs/speex/speex-1.2rc1-haiku.diff b/media-libs/speex/patches/speex-1.2rc1.patch
similarity index 100%
rename from media-libs/speex/speex-1.2rc1-haiku.diff
rename to media-libs/speex/patches/speex-1.2rc1.patch
diff --git a/media-libs/speex/speex-1.2.bep b/media-libs/speex/speex-1.2-git.bep
similarity index 86%
rename from media-libs/speex/speex-1.2.bep
rename to media-libs/speex/speex-1.2-git.bep
index 64e78a090..e86bdd33c 100644
--- a/media-libs/speex/speex-1.2.bep
+++ b/media-libs/speex/speex-1.2-git.bep
@@ -9,8 +9,8 @@ BUILD {
 	cd speex-1.2
 	libtoolize --copy --force --install
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
-	autogen.sh --prefix=/boot/common
-	./configure --prefix=/boot/common
+	autogen.sh --prefix=`finddir B_COMMON_DIRECTORY`
+	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
diff --git a/media-libs/speex/speex-1.2rc1.bep b/media-libs/speex/speex-1.2rc1.bep
index 03c8ceb64..6b26f3293 100644
--- a/media-libs/speex/speex-1.2rc1.bep
+++ b/media-libs/speex/speex-1.2rc1.bep
@@ -6,14 +6,12 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
-	cd tiff-3.8.2
-	cp /boot/home/config/share/libtool/config.guess config.guess
-	cp /boot/home/config/share/libtool/config.sub config.sub
-	libtoolize --copy --force
+	cd speex-1.2rc1
+	libtoolize --copy --force --install
 	aclocal
 	automake
 	autoconf
-	./configure --prefix=/boot/common
+	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }