diff --git a/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.bep b/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.bep
new file mode 100644
index 000000000..093c96677
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.bep
@@ -0,0 +1,24 @@
+DESCRIPTION="A branch for adding a new function to the FluidSynth API, fluid_player_add_mem." 
+HOMEPAGE="https://code.launchpad.net/~mgiuca/fluidsynth/midi-buffer" 
+SRC_URI="bzr+lp:~mgiuca/fluidsynth/midi-buffer"
+#CHECKSUM_MD5=""
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="dev-libs/glib >= 2.24.1
+		media-libs/libsndfile >= 1.0.18"
+
+BUILD {
+	cd fluidsynth-1.1-midi-buffer
+	cd fluidsynth
+	cmake .
+	make
+}
+
+INSTALL {
+	cd fluidsynth-1.1-midi-buffer
+	cd fluidsynth
+	make install
+}
+
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="2007-2011 Matt Giuca, Josh Green, Pedro Lopez-Cabanillas, David Henningsson"
diff --git a/media-sound/fluidsynth/fluidsynth-1.1.3.bep b/media-sound/fluidsynth/fluidsynth-1.1.3.bep
new file mode 100644
index 000000000..d4792455e
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-1.1.3.bep
@@ -0,0 +1,22 @@
+DESCRIPTION="Fluidsynth is a software real-time synthesizer based on the Soundfont 2 specifications." 
+HOMEPAGE="http://www.fluidsynth.org/" 
+SRC_URI="http://sourceforge.net/projects/fluidsynth/files/fluidsynth-1.1.3/fluidsynth-1.1.3.tar.bz2/download"
+CHECKSUM_MD5="6e35225b088eae0c2af0b78097941655"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="dev-libs/glib >= 2.24.1
+		media-libs/libsndfile >= 1.0.18"
+
+BUILD {
+	cd fluidsynth-1.1.3
+	cmake .
+	make
+}
+
+INSTALL {
+	cd fluidsynth-1.1.3
+	make install
+}
+
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="2007-2010 Josh Green, Pedro Lopez-Cabanillas, David Henningsson"
diff --git a/media-sound/fluidsynth/patches/fluidsynth-1.1-midi-buffer.patch b/media-sound/fluidsynth/patches/fluidsynth-1.1-midi-buffer.patch
new file mode 100644
index 000000000..e21a1f21f
--- /dev/null
+++ b/media-sound/fluidsynth/patches/fluidsynth-1.1-midi-buffer.patch
@@ -0,0 +1,38 @@
+diff -Naur fluidsynth-1.1-midi-buffer/fluidsynth/CMakeLists.txt fluidsynth-1.1-midi-buffer-haiku/fluidsynth/CMakeLists.txt
+--- fluidsynth-1.1-midi-buffer/fluidsynth/CMakeLists.txt	2011-04-24 20:59:42.047710208 -0300
++++ fluidsynth-1.1-midi-buffer-haiku/fluidsynth/CMakeLists.txt	2011-04-24 21:01:20.278134784 -0300
+@@ -166,10 +166,18 @@
+     add_definitions ( -mms-bitfields )
+   endif  ( MINGW )
+ else ( WIN32 )
+-# Check PThreads, but not in Windows
+-  find_package ( Pthreads REQUIRED )
+-  set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} )
+-  set ( LIBFLUID_LIBS "m" )
++
++if (UNIX AND NOT BEOS)
++# Check PThreads, but not in Windows 
++   find_package ( Pthreads REQUIRED )
++   set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} )
++   set ( LIBFLUID_LIBS "m" )
++endif (UNIX AND NOT BEOS)
++
++if (BEOS)
++set ( LIBFLUID_LIBS "network")
++endif (BEOS)
++
+ endif ( WIN32 )
+ 
+ # IBM OS/2
+diff -Naur fluidsynth-1.1-midi-buffer/fluidsynth/src/utils/fluid_sys.h fluidsynth-1.1-midi-buffer-haiku/fluidsynth/src/utils/fluid_sys.h
+--- fluidsynth-1.1-midi-buffer/fluidsynth/src/utils/fluid_sys.h	2011-04-24 20:59:42.047710208 -0300
++++ fluidsynth-1.1-midi-buffer-haiku/fluidsynth/src/utils/fluid_sys.h	2011-04-24 21:02:01.829685760 -0300
+@@ -335,7 +335,7 @@
+     sample data.
+  */
+ 
+-#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__)
++#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) && !defined(__HAIKU__)
+ #define fluid_mlock(_p,_n)      mlock(_p, _n)
+ #define fluid_munlock(_p,_n)    munlock(_p,_n)
+ #else
diff --git a/media-sound/fluidsynth/patches/fluidsynth-1.1.3.patch b/media-sound/fluidsynth/patches/fluidsynth-1.1.3.patch
new file mode 100644
index 000000000..a43b39386
--- /dev/null
+++ b/media-sound/fluidsynth/patches/fluidsynth-1.1.3.patch
@@ -0,0 +1,34 @@
+diff -Naur fluidsynth-1.1.3/CMakeLists.txt fluidsynth-1.1.3-haiku/CMakeLists.txt
+--- fluidsynth-1.1.3/CMakeLists.txt	2010-10-10 22:16:30.031457280 -0300
++++ fluidsynth-1.1.3-haiku/CMakeLists.txt	2011-04-24 14:21:01.000000000 -0300
+@@ -152,9 +152,18 @@
+   endif  ( MINGW )
+ else ( WIN32 )
+ # Check PThreads, but not in Windows 
++
++if (UNIX AND NOT BEOS)
++# Check PThreads, but not in Windows 
+   find_package ( Pthreads REQUIRED )
+   set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} )
+   set ( LIBFLUID_LIBS "m" )
++endif (UNIX AND NOT BEOS)
++
++if (BEOS)
++set ( LIBFLUID_LIBS "network")
++endif (BEOS)
++
+ endif ( WIN32 )
+ 
+ # IBM OS/2
+diff -Naur fluidsynth-1.1.3/src/utils/fluid_sys.h fluidsynth-1.1.3-haiku/src/utils/fluid_sys.h
+--- fluidsynth-1.1.3/src/utils/fluid_sys.h	2010-10-10 22:16:30.022806528 -0300
++++ fluidsynth-1.1.3-haiku/src/utils/fluid_sys.h	2011-04-24 14:17:52.000000000 -0300
+@@ -335,7 +335,7 @@
+     sample data.
+  */
+ 
+-#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__)
++#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) && !defined(__HAIKU__)
+ #define fluid_mlock(_p,_n)      mlock(_p, _n)
+ #define fluid_munlock(_p,_n)    munlock(_p,_n)
+ #else