diff --git a/media-libs/libebml/libebml-1.0.0.bep b/dev-libs/libebml-1.0.0.bep
similarity index 100%
rename from media-libs/libebml/libebml-1.0.0.bep
rename to dev-libs/libebml-1.0.0.bep
diff --git a/dev-libs/libebml/libebml-1.0.0.bep b/dev-libs/libebml/libebml-1.0.0.bep
new file mode 100644
index 000000000..5ac6e4c45
--- /dev/null
+++ b/dev-libs/libebml/libebml-1.0.0.bep
@@ -0,0 +1,23 @@
+DESCRIPTION="libebml is a C++ library to parse EBML content (read/write)." 
+HOMEPAGE="http://www.matroska.org/" 
+SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.0.0.tar.bz2"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+CHECKSUM_MD5="6d438f03d8928d83a2d120ed02705f03"
+BUILD {
+	cd libebml-1.0.0
+	cd make
+	cd linux
+	make
+}
+
+INSTALL {
+	cd libebml-1.0.0
+	cd make
+	cd linux
+	make install
+}
+
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="2005-2009 CoreCodec, Inc."
\ No newline at end of file
diff --git a/dev-libs/libebml/libebml-0.7.8-haiku.diff b/dev-libs/libebml/patches/libebml-0.7.8-haiku.diff
similarity index 100%
rename from dev-libs/libebml/libebml-0.7.8-haiku.diff
rename to dev-libs/libebml/patches/libebml-0.7.8-haiku.diff
diff --git a/dev-libs/libebml/patches/libebml-1.0.0.patch b/dev-libs/libebml/patches/libebml-1.0.0.patch
new file mode 100644
index 000000000..e69de29bb
diff --git a/media-libs/libebml/patches/libebml-1.0.0.patch b/media-libs/libebml/patches/libebml-1.0.0.patch
deleted file mode 100644
index 487ef1bc9..000000000
--- a/media-libs/libebml/patches/libebml-1.0.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urN /develop/projects/matroska/install/libebml-1.0.0/ebml/c/libebml_t.h /develop/projects/matroska/libebml-1.0.0/ebml/c/libebml_t.h
---- /develop/projects/matroska/install/libebml-1.0.0/ebml/c/libebml_t.h	2010-03-23 11:58:36.042729472 +0000
-+++ /develop/projects/matroska/libebml-1.0.0/ebml/c/libebml_t.h	2010-06-22 23:34:22.247201792 +0000
-@@ -72,7 +72,7 @@
-     typedef uint16_t uint16;
-     typedef uint8_t uint8;
- # endif // __GNUC__
--#elif defined(__BEOS__)
-+#elif defined(__BEOS__) || defined(__HAIKU__) 
- #include <SupportDefs.h>
- #elif defined(DJGPP)				/* SL : DJGPP doesn't support POSIX types ???? */
-     typedef signed long long int64;
-@@ -98,7 +98,7 @@
-     typedef uint32_t uint32;
-     typedef uint16_t uint16;
-     typedef uint8_t uint8;
--#elif defined(__BEOS__)
-+#elif defined(__BEOS__) || defined(__HAIKU__) 
- # include <support/SupportDefs.h>
- #else // anything else (Linux, BSD, ...)
- # include <inttypes.h>
-diff -urN /develop/projects/matroska/install/libebml-1.0.0/make/linux/Makefile /develop/projects/matroska/libebml-1.0.0/make/linux/Makefile
---- /develop/projects/matroska/install/libebml-1.0.0/make/linux/Makefile	2010-06-04 08:44:54.048758784 +0000
-+++ /develop/projects/matroska/libebml-1.0.0/make/linux/Makefile	2010-06-23 01:31:00.288358400 +0000
-@@ -13,6 +13,9 @@
- # BeOS wants the libs and headers in /boot/home/config
- ifeq (BeOS,$(shell uname -s))
- prefix=/boot/home/config
-+# Haiku wants the libs and headers in /boot/common
-+else ifeq (Haiku,$(shell uname -s))
-+prefix=/boot/common
- else
- prefix=/usr/local
- endif