diff --git a/x11-wm/compiz-fusion/Manifest b/x11-wm/compiz-fusion/Manifest
index 45f736b..efd665e 100644
--- a/x11-wm/compiz-fusion/Manifest
+++ b/x11-wm/compiz-fusion/Manifest
@@ -1 +1,2 @@
-EBUILD compiz-fusion-0.8.8-r9999.ebuild 949 RMD160 4add77884ee9a1748380fea43a006e65673dce92 SHA1 010a6adc9efc137416183da723bb940787605cd9 SHA256 5c6efe9ec0ac7a25371bd2b7bc244a572749f5938bbfa2de37c718b5e5d7179b
+EBUILD compiz-fusion-0.8.8-r9999.ebuild 921 RMD160 58670a46b4433f671f92710969af0115112a9e67 SHA1 b2fc05c4b0e576ea12a2666b05f46854dc1887d9 SHA256 3fbf908c0ef42720c823dba6abc49d8a65c922de3356b8817fda4cf8ec3a6305
+MISC metadata.xml 801 RMD160 9d2805e7d33affba8b59d94d7420c98e4eec5a84 SHA1 2da7331db432c98bdd46a656e58778eaa10a92f0 SHA256 7593757771b16ac2a917e7d58f9467ea6cd30e4fad8fa7fdd76d4448200b6317
diff --git a/x11-wm/compiz-fusion/compiz-fusion-0.8.8-r9999.ebuild b/x11-wm/compiz-fusion/compiz-fusion-0.8.8-r9999.ebuild
index 868e299..51d5310 100644
--- a/x11-wm/compiz-fusion/compiz-fusion-0.8.8-r9999.ebuild
+++ b/x11-wm/compiz-fusion/compiz-fusion-0.8.8-r9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz-fusion/compiz-fusion-0.8.6.ebuild,v 1.1 2010/04/03 06:13:26 jmbsvicetto Exp $
 
@@ -11,17 +11,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="emerald gnome kde unsupported"
 
-MY_PV=0.8.4
-
 RDEPEND="
 	>=x11-wm/compiz-${PV}
 	>=x11-plugins/compiz-plugins-main-${PV}
 	>=x11-plugins/compiz-plugins-extra-${PV}
-	unsupported? ( >=x11-plugins/compiz-plugins-unsupported-${MY_PV} )
-	>=x11-apps/ccsm-${MY_PV}
-	emerald? ( >=x11-wm/emerald-${MY_PV} )
-	gnome? ( >=x11-libs/compizconfig-backend-gconf-${MY_PV} )
-	kde? ( >=x11-libs/compizconfig-backend-kconfig4-${MY_PV} )"
+	unsupported? ( >=x11-plugins/compiz-plugins-unsupported-${PV} )
+	>=x11-apps/ccsm-0.8.4
+	emerald? ( >=x11-wm/emerald-${PV} )
+	gnome? ( >=x11-libs/compizconfig-backend-gconf-${PV} )
+	kde? ( >=x11-libs/compizconfig-backend-kconfig4-${PV} )"
 
 pkg_postinst() {
 	ewarn "If you want to try out simple-ccsm, you'll need to emerge it"
diff --git a/x11-wm/compiz-fusion/metadata.xml b/x11-wm/compiz-fusion/metadata.xml
new file mode 100644
index 0000000..e16cfa7
--- /dev/null
+++ b/x11-wm/compiz-fusion/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<use>
+  <flag name="emerald">Install the <pkg>x11-wm/emerald</pkg> package.</flag>
+  <flag name="unsupported">Install the <pkg>x11-plugins/compiz-fusion-plugins-unsupported</pkg> package.</flag>
+</use>
+<maintainer>
+  <email>pinkbyte@mail.ru</email>
+  <name>Pinkbyte</name>
+  <description>Maintainer. Assign bugs to him</description>
+</maintainer>
+<maintainer>
+  <email>naota@gentoo.org</email>
+  <name>Naohiro Aota</name>
+  <description>Proxy maintainer. CC him on bugs</description>
+</maintainer>
+<herd>desktop-effects</herd>
+<longdescription>
+compiz-fusion is a community-driven project that is aimed at extending the compiz window manager.
+</longdescription>
+</pkgmetadata>