diff --git a/games-engines/gemrb/ChangeLog b/games-engines/gemrb/ChangeLog
new file mode 100644
index 00000000..7984b199
--- /dev/null
+++ b/games-engines/gemrb/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for games-engines/gemrb
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  09 May 2010; Mario Fetka <mario.fetka@gmail.com> +gemrb-0.6.0.ebuild,
+  +metadata.xml:
+  bump
+
diff --git a/games-engines/gemrb/Manifest b/games-engines/gemrb/Manifest
index 0acfc651..1dbd9826 100644
--- a/games-engines/gemrb/Manifest
+++ b/games-engines/gemrb/Manifest
@@ -1,4 +1,8 @@
 AUX GemRB.cfg.sample 8767 RMD160 7f58156143d25546fbf2514410d3e3b020aadcbf SHA1 7826df65159efaad4a66147a404391f37c6f2583 SHA256 6e7c232fada9d13aa72ec5ca049ea6c1bfa8500e995e26008912d51134b6c76d
 DIST gemrb-0.5.0.tar.gz 2084847 RMD160 48fd9f77bd1a3f19b95d5aedd5e2825e5328d980 SHA1 86a01fadd1b4312021256908ba7aafdcb23d7e55 SHA256 795c7ce85ceed60f4f81a451f06969a12d6d812d71e10d85786ef64454f14de1
+DIST gemrb-0.6.0.tar.gz 2227197 RMD160 5c5d04a62453abae02a270eaa56676419fa5dbb3 SHA1 bc59f6111bb40a4a9b9c78ab9b7521d8e2da35f7 SHA256 64f8b5c08e7228ab6f6665abfb0ac5df6f69c701c74cf301b892c504efc7fa29
 EBUILD gemrb-0.5.0.ebuild 1170 RMD160 e93a88d1d12071f19013754ab6644f7b828dd098 SHA1 5f9e7150849ddabda048535715a73f2271933ed2 SHA256 dcd03b14808b867f776bd4ae74f4b5d9ffc19f69251ec691d7401703f43575fe
+EBUILD gemrb-0.6.0.ebuild 1268 RMD160 e7e12d608a26982eab8178e7b4aaa7096c469004 SHA1 f2223303999834d2ca8a5e4b031d4370183d728a SHA256 9d44776fa94e54955677ade76d15e4d1de191a477ab67d4e75bcf258702b940f
 EBUILD gemrb-9999.ebuild 1449 RMD160 d96e1a743b9af54f80b8781f6e961b0c8a694a6e SHA1 cf71a8cf386bfe0fb113bc9487fba379dbe23017 SHA256 3875bd4c0c15b66e9575a9c95fb2f094fe0576844f771f0d4ae6e410637f8c8b
+MISC ChangeLog 217 RMD160 796739f4eb8c25ee6f42949d63394f30fe07d401 SHA1 1ac03ccbc7b3827533bdf5e82ba5d651fe7693fb SHA256 664af5ce7055d792f49d72da32591b8758101ec6084c11dc0063f359995c201a
+MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/games-engines/gemrb/gemrb-0.6.0.ebuild b/games-engines/gemrb/gemrb-0.6.0.ebuild
new file mode 100644
index 00000000..542077e0
--- /dev/null
+++ b/games-engines/gemrb/gemrb-0.6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/gemrb-0.6.0.ebuild,v 1.3 2010/04/27 08:48:06 tupone Exp $
+PYTHON_DEPEND="2"
+
+EAPI=2
+inherit autotools eutils python games
+
+DESCRIPTION="Reimplementation of the Infinity engine"
+HOMEPAGE="http://gemrb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gemrb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+DEPEND=">=media-libs/libsdl-1.2
+	sys-libs/zlib
+	media-libs/libvorbis
+	media-libs/libpng
+	media-libs/openal"
+
+pkg_setup() {
+	python_set_active_version 2
+	games_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e 's|\$(bindir)/plugins/|\$(libdir)/|' \
+		Makefile.am \
+		|| die "sed failed"
+	sed -i \
+		-e '/NullSound/d' \
+		gemrb/plugins/Makefile.am \
+		|| die "sed failed"
+	sed -i \
+		-e '/sysconf_DATA = /d' \
+		gemrb/Makefile.am \
+		|| die "sed failed"
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--disable-dependency-tracking \
+		--docdir="/usr/share/doc/${PF}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	diropts -m0775 -g ${GAMES_GROUP}
+	keepdir "/var/cache/gemrb"
+	dodoc "${FILESDIR}/GemRB.cfg.sample" README AUTHORS
+	prepalldocs
+	prepgamesdirs
+}
diff --git a/games-engines/gemrb/metadata.xml b/games-engines/gemrb/metadata.xml
new file mode 100644
index 00000000..46a44e57
--- /dev/null
+++ b/games-engines/gemrb/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!-- 
+$Header: /var/cvsroot/gentoo-x86/skel.metadata.xml,v 1.18 2008/07/28 19:27:05 cardoe Exp $
+
+This is the example metadata file.
+The root element of this file is <pkgmetadata>. Within this element a 
+number of subelements are allowed: herd, maintainer, and 
+longdescription. herd is a required subelement.
+
+For a full description look at:
+http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml?part=2&chap=4
+
+
+Before committing, please remove the comments from this file. They are 
+not relevant for general metadata.xml files.
+-->
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>@gentoo.org</email>
+<!--  <description>Description of the maintainership</description> -->
+</maintainer>
+<!-- <longdescription>Long description of the package</longdescription> -->
+<!--
+<use>
+  <flag name='flag'>Description of how USE='flag' affects this package</flag>
+  <flag name='userland_GNU'>Description of how USERLAND='GNU' affects this
+	  package</flag>
+  <flag name='aspell'>Uses <pkg>app-text/aspell</pkg> for spell checking.
+	  Requires an installed dictionary from <cat>app-dicts</cat></flag>
+</use>
+-->
+</pkgmetadata>