diff --git a/www-apps/trac-crystalxtheme/ChangeLog b/www-apps/trac-crystalxtheme/ChangeLog
index 3dd9b288..0311bf81 100644
--- a/www-apps/trac-crystalxtheme/ChangeLog
+++ b/www-apps/trac-crystalxtheme/ChangeLog
@@ -1,7 +1,13 @@
-# ChangeLog for www-apps/trac-intrablogtheme
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# ChangeLog for www-apps/trac-crystalxtheme
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*trac-crystalxtheme-1.0 (12 Jul 2009)
+
+  12 Jul 2009; Mario Fetka <mario.fetka@gmail.com>
+  +trac-crystalxtheme-1.0.ebuild, +metadata.xml:
+  new version
+
   18 Aug 2007; Mario Fetka <mario-fetka@gmx.at> ChangeLog:
   Initial ebuild for Trac IntraBlog Theme
 
diff --git a/www-apps/trac-crystalxtheme/Manifest b/www-apps/trac-crystalxtheme/Manifest
index c7136712..0529ae67 100644
--- a/www-apps/trac-crystalxtheme/Manifest
+++ b/www-apps/trac-crystalxtheme/Manifest
@@ -1,2 +1,3 @@
-EBUILD trac-crystalxtheme-1.0.ebuild 1125 RMD160 4885a1b45c4cbafbee309753e893d08d711bf0ab SHA1 8cc6fd0a27cd9fd1ee0e8eb14da6800807137bf1 SHA256 ad63bbf1640a011163f9ce14ee805101ced1941001de1659929a3129eb3412e0
-MISC ChangeLog 231 RMD160 8d2e07cb3615f7ab152854ae2ba7d0d70a184b0c SHA1 bd041563a09dccbed73a2a87c330dc9548f585dd SHA256 f756c9260cae070151b72ae7d918b8cfba0f604ce946108057c364c302faad9e
+EBUILD trac-crystalxtheme-1.0.ebuild 1123 RMD160 35393df313e61aae8a283e421b99f6a8cc034f23 SHA1 baebac4b6e32b7b4a82018defe1733383f10099a SHA256 f8c57639ccefb686d5826101e5790d00a7d0525ce7f9b5623c2555890447af5a
+MISC ChangeLog 384 RMD160 92f4357debb45de76916f42be5fab03a8905376b SHA1 7954c61fbf5f95c8a6a85e066ab83c350d5907df SHA256 b6bc6d44e3dcb62a86d8a4247c42e32afeeb8c05fa221d6fcc95085b8f41c4f2
+MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/www-apps/trac-crystalxtheme/metadata.xml b/www-apps/trac-crystalxtheme/metadata.xml
new file mode 100644
index 00000000..46a44e57
--- /dev/null
+++ b/www-apps/trac-crystalxtheme/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>
diff --git a/www-apps/trac-crystalxtheme/trac-crystalxtheme-1.0.ebuild b/www-apps/trac-crystalxtheme/trac-crystalxtheme-1.0.ebuild
new file mode 100644
index 00000000..c10e3b27
--- /dev/null
+++ b/www-apps/trac-crystalxtheme/trac-crystalxtheme-1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac-webadmin/trac-webadmin-0.1.2.ebuild,v 1.4 2007/02/13 20:39:33 corsair Exp $
+
+inherit distutils subversion
+
+ESVN_REPO_URI="http://trac-hacks.org/svn/crystalxtheme/0.11"
+DESCRIPTION="A theme for Trac based on http://www.oswd.org/design/preview/id/3465."
+HOMEPAGE="http://trac-hacks.org/wiki/CrystalxTheme"
+# SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="trac"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+SLOT="0"
+
+DEPEND=">=www-apps/trac-0.10
+	>=www-apps/trac-themeengine-2.0
+	>=dev-python/setuptools-0.6_rc1"
+
+# from marienz's setuptools.eclass:
+src_install() {
+	"${python}" setup.py install --root=${D} --no-compile \
+		--single-version-externally-managed "$@" || die "install failed"
+}
+
+src_test() {
+	"${python}" setup.py test || die "tests failed"
+}
+
+pkg_postinst() {
+	elog "To enable the IntraBlog template, you have to add:"
+	elog "	[components]"
+	elog "	crystalxtheme.* = enabled"
+	elog
+	elog "	[theme]"
+	elog "	theme = CrystalX"
+	elog "to your trac.ini files."
+}