diff --git a/media-libs/fitz/fitz-1.0.bep b/media-libs/fitz/fitz-1.0.bep
new file mode 100644
index 000000000..48825807b
--- /dev/null
+++ b/media-libs/fitz/fitz-1.0.bep
@@ -0,0 +1,28 @@
+DESCRIPTION="Fitz is a library that is part of MuPDF. The renderer in MuPDF is tailored for high quality anti-aliased graphics. It renders text with metrics and spacing accurate to within fractions of a pixel for the highest fidelity in reproducing the look of a printed page on screen." 
+HOMEPAGE="http://code.google.com/p/mupdf/" 
+SRC_URI="http://mupdf.googlecode.com/files/mupdf-1.0-source.tar.gz"
+CHECKSUM_MD5="d986ab98e2b035b7abd61afc474562b3"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="jbig2dec >= 0.11 
+	openjpeg >= 1.5.0 
+	jpeg >= 8d
+	zlib >= 1.2.5
+	freetype >=2.4.9"
+BUILD {
+	cd mupdf-1.0-source
+	make libs
+}
+
+INSTALL {
+	cd mupdf-1.0-source
+	make install \
+		prefix=${DESTDIR}/`finddir B_COMMON_DIRECTORY` \
+		bindir=${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` \
+		libdir=${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY` \
+		incdir=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY` \
+		mandir=${DESTDIR}/`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man 
+}
+
+LICENSE="GNU GPL v3"
+COPYRIGHT="Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
diff --git a/media-libs/fitz/patches/fitz-1.0.patch b/media-libs/fitz/patches/fitz-1.0.patch
new file mode 100644
index 000000000..6946f4464
--- /dev/null
+++ b/media-libs/fitz/patches/fitz-1.0.patch
@@ -0,0 +1,36 @@
+diff -Naur mupdf-1.0-source/Makefile mupdf-1.0-source-haiku/Makefile
+--- mupdf-1.0-source/Makefile	2012-04-24 16:41:33.029097984 +0000
++++ mupdf-1.0-source-haiku/Makefile	2012-06-07 17:13:57.000000000 +0000
+@@ -12,8 +12,8 @@
+ # Do not specify CFLAGS or LIBS on the make invocation line - specify
+ # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
+ # set a variable that was set on the command line.
+-CFLAGS += $(XCFLAGS) -Ifitz -Ipdf -Ixps -Icbz -Iscripts
+-LIBS += $(XLIBS) -lfreetype -ljbig2dec -ljpeg -lopenjpeg -lz -lm
++CFLAGS += $(XCFLAGS) -Ifitz -Ipdf -Ixps -Icbz -Iscripts -I/boot/develop/headers/3rdparty/freetype2
++LIBS += -L/boot/common/lib/ -lfreetype -ljbig2dec -ljpeg -lopenjpeg -lz -lroot
+ 
+ include Makerules
+ include Makethird
+@@ -144,7 +144,7 @@
+ 
+ ifeq "$(NOX11)" ""
+ MUPDF := $(OUT)/mupdf
+-$(MUPDF) : $(FITZ_LIB) $(THIRD_LIBS)
++$(MUPDF) : $(FITZ_LIB)
+ $(MUPDF) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
+ 	$(LINK_CMD) $(X11_LIBS)
+ endif
+@@ -167,11 +167,10 @@
+ incdir ?= $(prefix)/include
+ mandir ?= $(prefix)/share/man
+ 
+-install: $(FITZ_LIB) $(MU_APPS) $(MUPDF)
++install: $(FITZ_LIB)
+ 	install -d $(bindir) $(libdir) $(incdir) $(mandir)/man1
+ 	install $(FITZ_LIB) $(libdir)
+ 	install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h $(incdir)
+-	install $(MU_APPS) $(MUPDF) $(bindir)
+ 	install $(wildcard apps/man/*.1) $(mandir)/man1
+ 
+ # --- Clean and Default ---
diff --git a/media-libs/speex/speex-1.2rc1.bep b/media-libs/speex/speex-1.2rc1.bep
index 2e58bbe86..e8d06c9ed 100644
--- a/media-libs/speex/speex-1.2rc1.bep
+++ b/media-libs/speex/speex-1.2rc1.bep
@@ -2,16 +2,21 @@ DESCRIPTION="Speex"
 HOMEPAGE="http://www.speex.org" 
 SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz"
 CHECKSUM_MD5="c4438b22c08e5811ff10e2b06ee9b9ae"
-REVISION="1"
+REVISION="2"
 STATUS_HAIKU="stable"
-DEPEND="pkgconfig >= 0.25"
+DEPEND="pkgconfig >= 0.25
+	libogg > 1.3.0"
 BUILD {
 	cd speex-1.2rc1
 	libtoolize --copy --force --install
 	aclocal
 	automake
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+				--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
+				--docdir=$COMMON_DOCS/doc/speex \
+				--mandir=$COMMON_DOCS/man
 	make
 }