diff --git a/app-admin/rcm/Manifest b/app-admin/rcm/Manifest
index 1aeb7bc..e5b6d7a 100644
--- a/app-admin/rcm/Manifest
+++ b/app-admin/rcm/Manifest
@@ -1,3 +1,4 @@
 DIST rcm-1.3.1.tar.gz 89437 SHA256 9c8f92dba63ab9cb8a6b3d0ccf7ed8edf3f0fb388b044584d74778145fae7f8f SHA512 1fd8ad6f8bee16177444469bddbef8d9b99f0b2bedc82c9833523370dfda4583c425f1ab8f2195f11236d1385553a2a49ead6d4c5f0803deeb56737b6836a0d9 WHIRLPOOL a5614c0901d413ac49584234dd8fc989e5add6d8f6af6a743e76998bb4655e84596e8d564c2ef5f0b80ab3c7c729eadb7c65d3ae40c370378ae72da7205bf4bd
-EBUILD rcm-1.3.1.ebuild 364 SHA256 4fdbdd0ff09f114c4d99b9e943d9f0882d549bc79a26a9eca72b939692218735 SHA512 d19b290e2e19317f505125b8bb2f579e033b6d8ed5bc83c6ed6675701f76a2594b2393a8c74450ca4e69316d692aefd625640d5449393453f1d956d450801d5c WHIRLPOOL 08428af89210a1d5a1b271ae19f35ef30f80dcad063a284a1bccd7f10ad8accd16c9a952c23c568d8f84d4c386b146dceb5162dfdbae5bbec8529bead146fe3f
-EBUILD rcm-9999.ebuild 427 SHA256 98497faccd988adab3b7fcc7fd0e3af792bfb931c046af877437ee1864e19840 SHA512 47ecd8384a3a95188a171fdacf953cf67b5e6f56426824dbb31f379f02ea3392bce5a4713eb04cf7fae59ae90cbaa1d249f54f351bdde2fc4b312fd49037932c WHIRLPOOL 98faa418c0577ab0a55da0c8af91ac19598fb733e194f047ce8266ac0b04ab56b0f4fe3c7e47787be591d2a8e451b311232a31736d6553bbc2cb18bc2d124b21
+EBUILD rcm-1.3.1.ebuild 362 SHA256 20fc67d730dde00688019819f7bd27df22d1e7d02bae0d161127d5eac7dbd251 SHA512 2d48e77d47c8f6d286df970ccd1d7e95537b0ba68bd0e1fc6226265b825ab6b2c6199a9c0602eb57ed350f7775cf83adc6e9de69d2b1bcc4e8c17e00da73ea25 WHIRLPOOL bca0ccdd359bb6e45ee4a6c7cbeadefe11338a5b11f1eaea96519f04ad0e768f99bba697b563f3483af39fbd0851fe6b00b6bab5ed08c732a5fb9a0502621870
+EBUILD rcm-9999.ebuild 416 SHA256 57fb70579fa668e0e36ec69a25fe6602373dae0f43a8c486198b9d20a1ca0a47 SHA512 9551e347b4f8529481064658d5ccb6363c2e1710042e90197a996eb50d242c02ca9dadec1dfcfcdb6f8c367e3c02b24065da51e794a5efe40c97ce0d676ef92e WHIRLPOOL 6157d7db5c71345da96e520605bba9b47f46a3acf4241e1bdfcde2998a8ef9d9190ac25ba180e20b71d87e04ad6ecb00b8fcfd49796f5a4cf79e021ee6d26686
+MISC metadata.xml 611 SHA256 fcf271608ad4d7dd7c9662cc1977eeacb0c3a0656636809df0998f591afddb49 SHA512 508ce28286fa519f6d071d06b1c75e23113f67b9d96d879d4fdd0ab9bfc9bbfaef5fa8e33c0e8a617aeaf58c3e979cb19fc2171779a8cd7e4de06ebad733bbb0 WHIRLPOOL bd1a656747fd4a4ed5069bd5caf0266479aa1f0d26ce6556b533205513e6a10d17d3b878f0175b48416444d8bf30013a3fd765e3706c92f8d20041911681363e
diff --git a/app-admin/rcm/metadata.xml b/app-admin/rcm/metadata.xml
new file mode 100644
index 0000000..4d26f07
--- /dev/null
+++ b/app-admin/rcm/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>fgtham+genbugs@gmail.com</email>
+		<name>Florian Tham</name>
+		<description>Proxy maintainer - set to assignee on bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">thoughtbot/rcm</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		rcm is a management suite for dotfiles.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/rcm/rcm-1.3.1.ebuild b/app-admin/rcm/rcm-1.3.1.ebuild
index 3500592..7d84ecf 100644
--- a/app-admin/rcm/rcm-1.3.1.ebuild
+++ b/app-admin/rcm/rcm-1.3.1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="rc file (dotfile) management"
 HOMEPAGE="https://github.com/thoughtbot/rcm"
 SRC_URI="https://thoughtbot.github.io/rcm/dist/rcm-1.3.1.tar.gz"
 
-LICENSE="BSD-3"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/app-admin/rcm/rcm-9999.ebuild b/app-admin/rcm/rcm-9999.ebuild
index 7088a95..31e7d7e 100644
--- a/app-admin/rcm/rcm-9999.ebuild
+++ b/app-admin/rcm/rcm-9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="rc file (dotfile) management"
 HOMEPAGE="https://github.com/thoughtbot/rcm"
 EGIT_REPO_URI="https://github.com/thoughtbot/rcm.git"
 
-LICENSE="BSD-3"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
 IUSE=""
@@ -19,7 +19,6 @@ DEPEND="dev-ruby/mustache"
 RDEPEND="${DEPEND}"
 
 src_prepare () {
-	cd ${S}
 	./autogen.sh
 	default
 }