diff --git a/x11-themes/emerald-themes/Manifest b/x11-themes/emerald-themes/Manifest
index 1ff7890..5b018d6 100644
--- a/x11-themes/emerald-themes/Manifest
+++ b/x11-themes/emerald-themes/Manifest
@@ -1,2 +1,3 @@
 DIST emerald-themes-0.5.2.tar.bz2 1563758 RMD160 e61676b946ba13eb05b0417aadac6ea1294e0254 SHA1 98a1c03592e883d15b3579f28b45cd7d8432ce94 SHA256 1c2c77a0fff352569a2f013e8b6c1fd99e2b6f9185c9a64d2cf2e918d9de4841
-EBUILD emerald-themes-0.5.2-r9999.ebuild 544 RMD160 f6cdcec917d8cc3c60803a11e3b7402f9efeab3e SHA1 6e5e874057b3ba679627b1a85de5b25a8e399e89 SHA256 5961013c77c1313f54ee9ad9126f55180ea2d4284821e29c7ed594637a6cb214
+EBUILD emerald-themes-0.5.2-r9999.ebuild 560 RMD160 8b8413e1b9f58697642d8e47175d53857607d8fb SHA1 d308cd0ccadd666f0cf88c9805d456b99b91eda3 SHA256 eaf64ed20d9393557723bd01bafcbe65cf7c99ff9b0d3e2b04847a4f9570cb5d
+MISC metadata.xml 552 RMD160 8769c7ed16bc9acedc84729a1c790f3249a54f85 SHA1 818ea438eeb6369cc10bb921cfde8fdeabc697ec SHA256 49b9624c20ec8bd9ac98f1f458d7dd8d8a2f9215f2bbfff61b1096cb6f2b1b9c
diff --git a/x11-themes/emerald-themes/emerald-themes-0.5.2-r9999.ebuild b/x11-themes/emerald-themes/emerald-themes-0.5.2-r9999.ebuild
index a49f3d3..67e0510 100644
--- a/x11-themes/emerald-themes/emerald-themes-0.5.2-r9999.ebuild
+++ b/x11-themes/emerald-themes/emerald-themes-0.5.2-r9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-themes/emerald-themes/emerald-themes-0.5.2.ebuild,v 1.3 2007/10/24 18:39:26 hanno Exp $
 
 DESCRIPTION="Emerald window decorator themes"
 HOMEPAGE="http://compiz.org"
-SRC_URI="http://releases.compiz-fusion.org/${PV}/${P}.tar.bz2"
+SRC_URI="http://cgit.compiz.org/fusion/decorators/${PV}/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-themes/emerald-themes/metadata.xml b/x11-themes/emerald-themes/metadata.xml
new file mode 100644
index 0000000..28fc176
--- /dev/null
+++ b/x11-themes/emerald-themes/metadata.xml
@@ -0,0 +1,17 @@
+<?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">Emerald themes are the themes for emerald
+</longdescription>
+</pkgmetadata>