diff --git a/app-shells/zsh-autosuggestions/Manifest b/app-shells/zsh-autosuggestions/Manifest
index 5c75daf..6e1e2bb 100644
--- a/app-shells/zsh-autosuggestions/Manifest
+++ b/app-shells/zsh-autosuggestions/Manifest
@@ -1,3 +1,3 @@
 EBUILD zsh-autosuggestions-20171017.ebuild 818 SHA256 5c88e6001cb45cbdedb49c0b8cc333f4423c46b01a8ec2b0eccd8adecf254929 SHA512 52c018349d9eaa2d1c35ab8d057109450036a914b8fde1947780ec3f447f9079f174ef5bf105551c1435536bb903dedbc18658ba4c22c32e679e56752157b355 WHIRLPOOL d98f5884e286a97bfe416fb35d52478b4ddfd525b250ac428ed28ca86c828884af43e4c6063993d7df233b540ec7d515dd065bbcee092f17319e422abf1e154d
-EBUILD zsh-autosuggestions-20171217-r1.ebuild 1045 SHA256 7f2070d3d9701eb2f0414a073563f770be64b386493f3f6f6809b0b5b5629f73 SHA512 b51a9665d8f09c329eae57a51e0fcc1e54ca5ef9e5cc5ab1b911497bbc36bdab16359913682d86387e8270ff63e60595a27fda7c9cab55dfa8e7b6625eb7b460 WHIRLPOOL f11b396f3d350489f0b8b9c096656757375d07120bd4ece7a306893c9e9acc84eae2257265947a86faeb927983d7b4b9067d755531fb4505107d71ceb3ddbec2
-EBUILD zsh-autosuggestions-20171217.ebuild 818 SHA256 d136614ed20e51c1fad5098cc32c39da242866a43fb44ee4838cbff61fe2a14a SHA512 fc75d2850306c633c1871f12b595b714e8886df25b02adeb883d4d03d4f0bf7d8826abc3901af20326954acacd5a9b7d410b77ece4c110553a7d9fc7f2d271a2 WHIRLPOOL b26a31227eba9ca36aa8ae210cd31c5c0e1e5f3ec28e28949e7d9add76a72dddc49fd077cf13aac26ee3d5d10f2932498427c78532ca3d3023a2d08ff2e9c358
+EBUILD zsh-autosuggestions-20171217-r2.ebuild 1036 SHA256 d5988c99b026c0145b6dbfa1b0e1f2c3b9313d939dfde1f9a3ba26f13b8bbdc2 SHA512 9ade1c9d587399164523fce532b42c6be3b707d02cf3f8fcf7ea85ce8842a48d01dc4f8f7eebb0a566b0e75b2b22da48b766c0f18691f0b696621a5f236156ea WHIRLPOOL a65b3d5bb3eaf4b8ba993cb19ec629ad854483d87aa04c37e2b560a50242b43a035cd265ed2dc77679414a0acecb8f6aba7dd74f6326faa1292ed3f940a7ea00
+MISC metadata.xml 222 SHA256 f41a53e7bfb1eeafcb57bea0b0a2249a053267c03d444ce6cb62077bb5fc27e9 SHA512 dad470f0096a4fb3af9eeb60dab3216ece032790f6c49a3b014799ee0c02dee96a67317a672344e32f5614c5e05419727cc99113c6ecc37ae594931dd6441eef WHIRLPOOL 2e6b58f457c8d368b58e8396edba4364c28d9890a1903973809089e175457f754be7ea65400a9ee2b6223ed4cf23dde7fbdc7162537ecc218e9c637e78a814c0
diff --git a/app-shells/zsh-autosuggestions/metadata.xml b/app-shells/zsh-autosuggestions/metadata.xml
new file mode 100644
index 0000000..5993c93
--- /dev/null
+++ b/app-shells/zsh-autosuggestions/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>trenttdually@gmail.com</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-shells/zsh-autosuggestions/zsh-autosuggestions-20171217-r1.ebuild b/app-shells/zsh-autosuggestions/zsh-autosuggestions-20171217-r2.ebuild
similarity index 95%
rename from app-shells/zsh-autosuggestions/zsh-autosuggestions-20171217-r1.ebuild
rename to app-shells/zsh-autosuggestions/zsh-autosuggestions-20171217-r2.ebuild
index d2526ff..0ff5aff 100644
--- a/app-shells/zsh-autosuggestions/zsh-autosuggestions-20171217-r1.ebuild
+++ b/app-shells/zsh-autosuggestions/zsh-autosuggestions-20171217-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,6 @@ DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add to your ~/.zshrc
 source '${ZSH_DEST}/zsh-autosuggestions.zsh'"
 
 src_compile() {
-	cd ${S}
 	make -B zsh-autosuggestions.zsh
 }
 
diff --git a/app-shells/zsh-autosuggestions/zsh-autosuggestions-20171217.ebuild b/app-shells/zsh-autosuggestions/zsh-autosuggestions-20171217.ebuild
deleted file mode 100644
index fb56d30..0000000
--- a/app-shells/zsh-autosuggestions/zsh-autosuggestions-20171217.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils git-r3 readme.gentoo-r1
-
-DESCRIPTION="Fish shell like fast/unobtrusive autosuggestions for zsh"
-HOMEPAGE="https://github.com/zsh-users/zsh-autosuggestions"
-EGIT_COMMIT="c7d4a85031c101ef9bce0018096622087894dd09"
-SRC_URI=""
-EGIT_REPO_URI="${HOMEPAGE}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="app-shells/zsh"
-RDEPEND="${DEPEND}"
-
-ZSH_DEST="/usr/share/zsh/site-contrib/${PN}"
-DISABLE_AUTOFORMATTING="true"
-
-DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add to your ~/.zshrc
-source '${ZSH_DEST}/zsh-autosuggestions.zsh'"
-
-src_install() {
-	insinto "${ZSH_DEST}"
-	doins -r *
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	elog "${DOC_CONTENTS}"
-}