diff --git a/app-emulation/opencbm/ChangeLog b/app-emulation/opencbm/ChangeLog
new file mode 100644
index 00000000..30fdde01
--- /dev/null
+++ b/app-emulation/opencbm/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for app-emulation/opencbm
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  31 Dec 2007; Mario Fetka <mario-fetka@gmx.at> +metadata.xml,
+  opencbm-0.4.2a.ebuild:
+  Initial opencbm ebuild
+
diff --git a/app-emulation/opencbm/Manifest b/app-emulation/opencbm/Manifest
index 38fccde0..4d013e2f 100644
--- a/app-emulation/opencbm/Manifest
+++ b/app-emulation/opencbm/Manifest
@@ -22,19 +22,23 @@ AUX 0.4.2a/97_no_demo.dpatch 670 RMD160 323a2091c850f9bb973fe02626cf0b076ea634b8
 MD5 808ceba91ee355e4614d9b45bb5dbf80 files/0.4.2a/97_no_demo.dpatch 670
 RMD160 323a2091c850f9bb973fe02626cf0b076ea634b8 files/0.4.2a/97_no_demo.dpatch 670
 SHA256 08b2e99f0126d82814d946af83061cb0fc8267156b0dacda920207e57bd3734a files/0.4.2a/97_no_demo.dpatch 670
-AUX Makefile 1019 RMD160 2e85df5944c82ffbc0f5fbc7a2946a83c01c2e0c SHA1 cb1deccedb54a7e5db66ca3132071be3b510efd4 SHA256 2187b63893f194b7862efa7df4b4fa345e8fc8ed9010cd19e0c30c9c1a476618
-MD5 a9cc3060424f16c148c084524a9a0b23 files/Makefile 1019
-RMD160 2e85df5944c82ffbc0f5fbc7a2946a83c01c2e0c files/Makefile 1019
-SHA256 2187b63893f194b7862efa7df4b4fa345e8fc8ed9010cd19e0c30c9c1a476618 files/Makefile 1019
-AUX Makefile.mod 314 RMD160 46cb64daf4542fc7ef69f7fdfccf7369f9c09cbc SHA1 41eb7439576e615c4748a8b3614c5729ce5a331c SHA256 eb685fb8fa821b8b6c4770ebc5e6ecb3e8288db7df0c3a159d4c01e895bc820c
-MD5 a35ee560dcba948b70340d3202e469ad files/Makefile.mod 314
-RMD160 46cb64daf4542fc7ef69f7fdfccf7369f9c09cbc files/Makefile.mod 314
-SHA256 eb685fb8fa821b8b6c4770ebc5e6ecb3e8288db7df0c3a159d4c01e895bc820c files/Makefile.mod 314
+AUX Makefile 1003 RMD160 7f70ec429c51206864e72d82aee80aa5ef655d70 SHA1 c072491f3b775b00463805a6b70744d8ccf56501 SHA256 7b2d7f35f20d72a1e0a5f6bde2d9da8168891c2994b4b9828b7892f8cbb8a93c
+MD5 1bef7be17d1938581aa7b720a3c80914 files/Makefile 1003
+RMD160 7f70ec429c51206864e72d82aee80aa5ef655d70 files/Makefile 1003
+SHA256 7b2d7f35f20d72a1e0a5f6bde2d9da8168891c2994b4b9828b7892f8cbb8a93c files/Makefile 1003
 DIST opencbm-0.4.2a-src.zip 745788 RMD160 825bded87a51e6fd2f76d8ba4bbcf31fada54277 SHA1 4eb3653609e4bc0725c0f2a8f4447e6928616e9f SHA256 c246f2484efe4835470f82b6b91f85569550f47e433fb8b042498dae9b061485
-EBUILD opencbm-0.4.2a.ebuild 1556 RMD160 e34591914cfb9ae890a6d8213891e811410ba911 SHA1 e769841b8be139d357b259c0039f557d01c9d6e6 SHA256 6b7146177301e1bc548598e05f8bd2d536b1e582fd751f41177dc90fa75fa26f
-MD5 0d025add48402e424a145c396a70d2f6 opencbm-0.4.2a.ebuild 1556
-RMD160 e34591914cfb9ae890a6d8213891e811410ba911 opencbm-0.4.2a.ebuild 1556
-SHA256 6b7146177301e1bc548598e05f8bd2d536b1e582fd751f41177dc90fa75fa26f opencbm-0.4.2a.ebuild 1556
+EBUILD opencbm-0.4.2a.ebuild 1592 RMD160 84c44742f2ad379161c2b85188e4e5bbd2368cbf SHA1 2d2441926a67cb1b74c22fb6828d7e44c513dfd4 SHA256 7a6a9abcd8e118323e7bf2331c1346a2009a2bbebae66284cd5228220c40d679
+MD5 048e702510b5fee72cd479b2b4c374d1 opencbm-0.4.2a.ebuild 1592
+RMD160 84c44742f2ad379161c2b85188e4e5bbd2368cbf opencbm-0.4.2a.ebuild 1592
+SHA256 7a6a9abcd8e118323e7bf2331c1346a2009a2bbebae66284cd5228220c40d679 opencbm-0.4.2a.ebuild 1592
+MISC ChangeLog 236 RMD160 59f952e739b91395e5d4087039a69f8157a591f5 SHA1 b45fb4da8dde0021b4962fa195b9d27ad884f48e SHA256 f060b1faa042693fe48dfc15e57ec3039c08f69116db629fd795c6631f1c6628
+MD5 6300490f7f751f966717dce4605f9896 ChangeLog 236
+RMD160 59f952e739b91395e5d4087039a69f8157a591f5 ChangeLog 236
+SHA256 f060b1faa042693fe48dfc15e57ec3039c08f69116db629fd795c6631f1c6628 ChangeLog 236
+MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
+MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
+RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
+SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
 MD5 3914e3f8771ec53d9213216d5d6049e3 files/digest-opencbm-0.4.2a 247
 RMD160 1b58f4b077bb06971661184bc374596f924d03c7 files/digest-opencbm-0.4.2a 247
 SHA256 551412e6d7e37f4c94ddfad0044be74e97c28a0404844b1467ec3b5e77480abb files/digest-opencbm-0.4.2a 247
diff --git a/app-emulation/opencbm/metadata.xml b/app-emulation/opencbm/metadata.xml
new file mode 100644
index 00000000..7e328698
--- /dev/null
+++ b/app-emulation/opencbm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>maintainer-wanted</herd>
+</pkgmetadata>
diff --git a/app-emulation/opencbm/opencbm-0.4.2a.ebuild b/app-emulation/opencbm/opencbm-0.4.2a.ebuild
index 28ce3153..c2cb0057 100644
--- a/app-emulation/opencbm/opencbm-0.4.2a.ebuild
+++ b/app-emulation/opencbm/opencbm-0.4.2a.ebuild
@@ -17,10 +17,6 @@ DEPEND="virtual/linux-sources
 	dev-embedded/cc65
 	app-text/linuxdoc-tools"
 
-#MAKEOPTS="${MAKEOPTS} -j1"
-
-#BUILD_PARAMS="-f LINUX/Makefile"
-#BUILD_PARAMS="-f LINUX/Makefile KERNEL_SOURCE=$KERNEL_DIR"
 BUILD_PARAMS="KDIR=$KERNEL_DIR"
 MODULE_NAMES="cbm(misc:${S}/sys/linux:${S}/sys/linux)"
 BUILD_TARGETS="all"
@@ -29,13 +25,17 @@ MODULESD_NOVFS_ENABLED=""
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-#	convert_to_m sys/linux/LINUX/Makefile
+	# convert linefeed
 	edos2unix `find . -name '*' -type f`
+	# 6502 sources ar always up to date
 	touch `find . -name '*.?65' -type f`
+	# add debian patches no demo & doc & no kernel
 	epatch ${FILESDIR}/${PV}/*
+	# sed correct path
 	sed -e 's,^PREFIX.*,PREFIX = /usr,' \
                 -e 's,/man/man1,/share/man/man1,g' \
                 -e 's,/info,/share/info,g' -i ${S}/LINUX/config.make
+	# copy module makefile that don't itefer with gentoo kernel build system
 	cp ${FILESDIR}/Makefile ${S}/sys/linux/Makefile
 }