diff --git a/x11-plugins/compiz-plugins-extra/Manifest b/x11-plugins/compiz-plugins-extra/Manifest
index 1f9b02b..0442834 100644
--- a/x11-plugins/compiz-plugins-extra/Manifest
+++ b/x11-plugins/compiz-plugins-extra/Manifest
@@ -1,4 +1,5 @@
 AUX compiz-plugins-extra-0.8.8-libnotify.patch 701 RMD160 be292728a4da1e3647919feb8c377fd3b079d001 SHA1 f4a1db4145840d4ef61be6d08f35c44726b66798 SHA256 8ebc9f57ed80476387a8142facd60e231dd1aa70ff5df508421cd7ca27616bcc
 AUX compiz-plugins-extra-no-gconf.patch 585 RMD160 bb3b291eab783be7f9754d724d3a96618fe2e614 SHA1 564d6614cc157397ae24347a731a9f4d65bf30f8 SHA256 0567850b07c3973f1b4bfd5c36a1e240a57e45a1714b63637ecec577febfc13f
 DIST compiz-plugins-extra-0.8.8.tar.bz2 2689953 RMD160 948fc491075f202759a31a3395fcd31deb6fa101 SHA1 ce592993696c0b5d4e0bb13171897b4c25b3844e SHA256 bdce203098c62370b01b87741b04d3d9bc37e918789acce07120c4f081d5bbe3
-EBUILD compiz-plugins-extra-0.8.8-r9999.ebuild 1564 RMD160 28cf176862dd4bb9cfee9b434ab691090e9490f0 SHA1 ffedde3e900095a8b784856285f07937006da03a SHA256 59504a217dcdbbe674c9f21932d9a1a1e3b7981b5c1f0ebce02240196f89256a
+EBUILD compiz-plugins-extra-0.8.8-r9999.ebuild 1416 RMD160 481a0430e8ec24b550d60ad8dacf1fb517d19bd6 SHA1 04a01a160e1058a7e090f45aac68317a88181a07 SHA256 b9f9e4fab58f1408b1c07a979909747c47aabedab3b6e6a4b944e5c3ae577bd3
+MISC metadata.xml 635 RMD160 254ac795726f3ed90c85945f1c3bca9597cfc1d2 SHA1 cae4d4184b4530628dac878f077bca339b2fec24 SHA256 e2023c254ee05395db536f19d88d1735ddcec97e260a50a5db717249e0f3ba93
diff --git a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.8-r9999.ebuild b/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.8-r9999.ebuild
index 4876927..0f73c64 100644
--- a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.8-r9999.ebuild
+++ b/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.8-r9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-r1.ebuild,v 1.5 2011/03/21 19:47:45 nirbheek Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit autotools eutils gnome2-utils
 
@@ -15,12 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="gconf libnotify"
 
-MY_PV="0.8.4"
-
 RDEPEND="
 	>=gnome-base/librsvg-2.14.0:2
 	virtual/jpeg:0
-	>=x11-libs/compiz-bcop-${MY_PV}
+	>=x11-libs/compiz-bcop-${PV}
 	>=x11-plugins/compiz-plugins-main-${PV}
 	>=x11-wm/compiz-${PV}[gconf?]
 	libnotify? ( x11-libs/libnotify )
@@ -28,22 +26,21 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19
+	virtual/pkgconfig
 	>=sys-devel/gettext-0.15
 	x11-libs/cairo
 	gconf? ( gnome-base/gconf:2 )
 "
 
+DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
+
 src_prepare() {
 	if ! use gconf; then
 		epatch "${FILESDIR}"/${PN}-no-gconf.patch
 	fi
-
 	epatch "${FILESDIR}/${P}-libnotify.patch"
 
-	# required to apply the above patch
-	intltoolize --copy --force || die "intltoolize failed"
-	eautoreconf || die "eautoreconf failed"
+	eautoreconf
 }
 
 src_configure() {
@@ -56,7 +53,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 	find "${D}" -name '*.la' -delete || die
 }
 
diff --git a/x11-plugins/compiz-plugins-extra/metadata.xml b/x11-plugins/compiz-plugins-extra/metadata.xml
new file mode 100644
index 0000000..907c491
--- /dev/null
+++ b/x11-plugins/compiz-plugins-extra/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-effects</herd>
+<longdescription lang="en">
+>Package with several compiz-fusion plugins:
+addhelper, bench, crashhandler, cubecaps, cubereflex, extrawm, fadedesktop, firepaint, gears,
+goto-viewport, group, mblur, reflex, scalefilter, showdesktop, splash, trailfocus, widget.
+</longdescription>
+  <use>
+    <flag name="gconf">
+      Install GConf schemas for the plugins, needed when using the GConf-based
+      configuration backend in <pkg>x11-wm/compiz</pkg>.
+    </flag>
+  </use>
+</pkgmetadata>
+