diff --git a/x11-libs/libcompizconfig/Manifest b/x11-libs/libcompizconfig/Manifest
index b635f87..0e008d4 100644
--- a/x11-libs/libcompizconfig/Manifest
+++ b/x11-libs/libcompizconfig/Manifest
@@ -1,3 +1,3 @@
-AUX libcompizconfig-undefinedref.patch 1204 RMD160 69538e32c526828d1e3d0ae6116f7b62a207edba SHA1 c97312c81ac6ac445d56599c10cf67418f0bd9db SHA256 27c3a644ea5b0b309ec32ed79f4a51f81ec2bc20cc9ccc73525237785052581d
 DIST libcompizconfig-0.8.8.tar.bz2 318176 RMD160 bdd9f26d092c6eccfd651ea2735d1544311d731f SHA1 8ea1f15fd9e1e2eb37a9814646659a31a8018fd8 SHA256 50a81aba31d9517587f7d046b7161eb4204ddceb422d09d036a412bb80381490
-EBUILD libcompizconfig-0.8.8-r9999.ebuild 847 RMD160 12d37ebe086f2974953713de348639f33271733a SHA1 c8db45ac7597089d190e1d747e3e120b16fd21d9 SHA256 d21a1b7cb72be1783cec39c873991d70a270c871e06303feb3c013d31003da27
+EBUILD libcompizconfig-0.8.8-r9999.ebuild 800 RMD160 a94a08f29c0a99be9598ca025077af2421913e48 SHA1 5fda4b0b5ff3659297d4082a182a056e880223df SHA256 dd875c05a81813d2df7ccbb3db35c3cb6cb21e26dd3a035cf300add330d2a8bf
+MISC metadata.xml 576 RMD160 1c35eeb3804a93d73a8b8fbac6b8faea5ba7acc1 SHA1 ed37e9534cf5beae4c639f6a49e1b18193d8beb3 SHA256 2a0d421cc897b30f954cbbb10c8a2f5a2d5796787e0ca364d8e154549eb45d2c
diff --git a/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r9999.ebuild b/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r9999.ebuild
index b68db6f..daf4aa6 100644
--- a/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r9999.ebuild
+++ b/x11-libs/libcompizconfig/libcompizconfig-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-libs/libcompizconfig/libcompizconfig-0.8.4-r2.ebuild,v 1.2 2011/03/21 19:52:57 nirbheek Exp $
 
-EAPI="2"
+EAPI="4"
 
 DESCRIPTION="Compiz Configuration System"
 HOMEPAGE="http://www.compiz.org/"
@@ -20,19 +20,20 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.41
-	>=dev-util/pkgconfig-0.19
+	virtual/pkgconfig
 "
 
 RESTRICT="test"
 
+DOCS="AUTHORS ChangeLog INSTALL NEWS README"
+
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		--enable-fast-install \
 		--disable-static
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 	find "${D}" -name '*.la' -delete || die
 }
diff --git a/x11-libs/libcompizconfig/metadata.xml b/x11-libs/libcompizconfig/metadata.xml
new file mode 100644
index 0000000..0d5b6bf
--- /dev/null
+++ b/x11-libs/libcompizconfig/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<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 lang="en">Libcompizconfig is an alternative configuration system for compiz.</longdescription>
+</pkgmetadata>