diff --git a/media-libs/libtheora/libtheora.OptionalPackageDescription b/media-libs/libtheora/libtheora.OptionalPackageDescription
new file mode 100644
index 000000000..b7955f9cc
--- /dev/null
+++ b/media-libs/libtheora/libtheora.OptionalPackageDescription
@@ -0,0 +1,5 @@
+Package:	libtheora
+Version:	1.0
+Copyright:	2002-2008 Xiph.Org Foundation and contributors.
+License:	Xiph
+URL:	http://www.xiph.org/
diff --git a/media-libs/libtheora/libtheora-1.0-haiku.diff b/media-libs/libtheora/patches/libtheora-1.0.patch
similarity index 100%
rename from media-libs/libtheora/libtheora-1.0-haiku.diff
rename to media-libs/libtheora/patches/libtheora-1.0.patch
diff --git a/media-libs/speex/speex.OptionalPackageDescription b/media-libs/speex/speex.OptionalPackageDescription
new file mode 100644
index 000000000..48e6072e6
--- /dev/null
+++ b/media-libs/speex/speex.OptionalPackageDescription
@@ -0,0 +1,11 @@
+Package:	speex
+Version:	1.2rc1-git-2009-09-15
+Copyright:	2002-2009 Xiph.org Foundation
+Copyright:	2002-2008 Jean-Marc Valin
+Copyright:	2005-2007 Analog Devices Inc.
+Copyright:	2005-2008 Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+Copyright:	1993, 2002, 2006 David Rowe
+Copyright:	2003 EpicGames
+Copyright:	1992-1994 Jutta Degener, Carsten Bormann
+License:	Speex
+URL:	http://www.xiph.org/
\ No newline at end of file
diff --git a/media-sound/bladeenc/bladeenc.OptionalPackageDescription b/media-sound/bladeenc/bladeenc.OptionalPackageDescription
new file mode 100644
index 000000000..07f45dd83
--- /dev/null
+++ b/media-sound/bladeenc/bladeenc.OptionalPackageDescription
@@ -0,0 +1,5 @@
+Package:	bladeenc
+Version:	0.94.2
+Copyright:	1998-2001 Tord Jansson et al.
+License:	GNU LGPL v2.1
+URL:		http://bladeenc.mp3.no/
\ No newline at end of file
diff --git a/sys-libs/readline/readline-5.2-haiku.diff b/sys-libs/readline/patches/readline-5.2.patch
similarity index 100%
rename from sys-libs/readline/readline-5.2-haiku.diff
rename to sys-libs/readline/patches/readline-5.2.patch
diff --git a/sys-libs/readline/readline-6.0-haiku.diff b/sys-libs/readline/patches/readline-6.0.patch
similarity index 100%
rename from sys-libs/readline/readline-6.0-haiku.diff
rename to sys-libs/readline/patches/readline-6.0.patch
diff --git a/sys-libs/readline/readline-5.2.bep b/sys-libs/readline/readline-5.2.bep
index 9ba783d9b..432095d34 100644
--- a/sys-libs/readline/readline-5.2.bep
+++ b/sys-libs/readline/readline-5.2.bep
@@ -2,8 +2,6 @@ DESCRIPTION="readline"
 HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" 
 SRC_URI="ftp://ftp.cwru.edu/pub/bash/readline-5.2.tar.gz"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/sys-libs/readline/readline-6.0.bep b/sys-libs/readline/readline-6.0.bep
new file mode 100644
index 000000000..96bb575b0
--- /dev/null
+++ b/sys-libs/readline/readline-6.0.bep
@@ -0,0 +1,20 @@
+DESCRIPTION="readline" 
+HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" 
+SRC_URI="ftp://ftp.cwru.edu/pub/bash/readline-6.0.tar.gz"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd readline-6.0
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake
+	./configure --prefix=/boot/common
+	make
+}
+
+INSTALL {
+	cd readline-6.0
+	make install
+}
diff --git a/sys-libs/readline/readline.OptionalPackageDescription b/sys-libs/readline/readline.OptionalPackageDescription
new file mode 100644
index 000000000..c5ef387de
--- /dev/null
+++ b/sys-libs/readline/readline.OptionalPackageDescription
@@ -0,0 +1,5 @@
+Package:	readline
+Version:	6.0
+Copyright:	1989-2009 Free Software Foundation, Inc.
+License:	GNU GPL v3
+URL:		http://tiswww.case.edu/php/chet/readline/rltop.html
\ No newline at end of file