diff --git a/app-shells/zsh-syntax-highlighting/Manifest b/app-shells/zsh-syntax-highlighting/Manifest
index 8049f4c..782f8d6 100644
--- a/app-shells/zsh-syntax-highlighting/Manifest
+++ b/app-shells/zsh-syntax-highlighting/Manifest
@@ -1,6 +1,5 @@
 DIST zsh-syntax-highlighting-0.6.0.tar.gz 111534 BLAKE2B 0d52f462075106dca4b0675b6d1e10b257fa1e0e6415c4f8bac7e1b4d9c94d606362624ff11d071eb565f17c3c81a25ae1f8bd0b44a3239ba747638aeab7ef1f SHA512 bb83f41336e9010aa78ee5adc9a216ee53f3b4347041d1b273083940d9db4d0e4acd960150b28c41f6e5e8d00b029f00fca6f9a46955892e4547a9f2345e3b85
-EBUILD zsh-syntax-highlighting-0.6.0.ebuild 1109 BLAKE2B f0b1bc0fcd302c97368816a2447139531a83ca8cf7776e0447b6d1ccb6ca610c64b3f58cfddd3abe690bcacf2075dc1dca8304bdc95c327e29367281c537174b SHA512 f3ce5890412733621636e65232907edd4ffc90f939ab57433d48c423741212ab21e7e86423d53ce6396dfb39e4bddd17b6effd1e3decebe6eee519af86cb3f95
-EBUILD zsh-syntax-highlighting-20180219-r1.ebuild 1129 BLAKE2B 9be13b4b1003d8b1903e330fff3ce9a220fa796cc1ac2e4139b4eb0b2d1313f1f027b664086c45ba6694293006419807f148ee05a6ced91acb623f804f573c27 SHA512 5a0f2a4f7f248327fcd7f9988dbd10f319970a2fbdfcf75516f84e3fb87c73e25af95cd8e1c9d3b26ba079d597cd9e8ef4cd65632ecaf0286b60638999ce8576
-EBUILD zsh-syntax-highlighting-20180612-r1.ebuild 1129 BLAKE2B fb739f55bb4702bc5be31ff2323846d99d5c354753d1b9f75c3bcbafaa69dee88d62fcf2f1e676f7576c0b53d10806f9928fafc7f6913f18dfbad1e889d576bc SHA512 d35ecbaefd8580c21ed3d65087d6503b70e53006d6ae3f4fe12a2bc98362b543e83ff24c0e53d8f9290fcec0790d2533619b1647eaff63e15eb5ff1b3380776e
+EBUILD zsh-syntax-highlighting-0.6.0-r1.ebuild 1114 BLAKE2B fa97d8c3e84b6002ff95eafd1624003c94706bc75808ee3058b2f933eea618f39c999cb280dcffc1db660f7dae0be5141e3dda97e4b73f428276e3dff20e4393 SHA512 93b9f0e398d7dc980413269556ef48e4e5a3be391954c1486498ce3ccbaf069424b11b2a52973efb78afa947cbfb29fe776eafa9a2277fb5bba09d5e6a4d30d8
+EBUILD zsh-syntax-highlighting-20180612-r2.ebuild 1134 BLAKE2B 9f7f87e83c7b8e519b75e13d2aa92113c71c40a09735136c930a2b46ee044c0da668e812a3abc9e34213c7a9c7a76107538e490cec00b56d0960b0ffd7b64798 SHA512 478e0b0d358584c01fcf7dfc82e8874f0eefdab06d3e630d5751afa6d426e8cd288b0041d6a2d2de67e5862a45a3778a16c335826acabe63f103c95a413deae0
 MISC README.md 113 BLAKE2B a534676440654cc1c66a30ae58d61f74be16545ade8430d5fbf80b56084857ecbcf2a9307c4b8dd79fe6a4ef185986cbeb2ce03679016c211bf387ad3cc4e74a SHA512 35ccccbf60e7f523bdc218ba111c370ce7715f9bd33152c690d6f7ddac3e6239be6e556fca0a8a1e39ea17db81a24b256438593ea337660efcc602b4a5d850aa
 MISC metadata.xml 222 BLAKE2B f0ecd2d956de9c731b8a6b6860f8756cb8dba0591f73463ce32d2747a1aa21296886faea89feee2b208286bbcdfe8e2e0a64263a92e954615fa94e2852d933d5 SHA512 dad470f0096a4fb3af9eeb60dab3216ece032790f6c49a3b014799ee0c02dee96a67317a672344e32f5614c5e05419727cc99113c6ecc37ae594931dd6441eef
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.6.0.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.6.0-r1.ebuild
similarity index 97%
rename from app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.6.0.ebuild
rename to app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.6.0-r1.ebuild
index 0959ae7..e6cc04c 100644
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.6.0.ebuild
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.6.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zsh-users/zsh-syntax-highlighting/archive/${PV}.tar.
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
 IUSE="+doc"
 
 DEPEND="app-shells/zsh"
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-20180219-r1.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-20180219-r1.ebuild
deleted file mode 100644
index c6144fe..0000000
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-20180219-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 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 syntax highlighting for Zsh"
-HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting"
-SRC_URI=""
-EGIT_REPO_URI="${HOMEPAGE}"
-EGIT_COMMIT="15e288a25ca0fbad5ad3aeddf134910ee2cf5e8a"
-PROPERTIES="live"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+doc"
-
-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-syntax-highlighting.zsh'"
-
-MAKE_ARGS=(
-	"SHARE_DIR=${ED}/usr/share/zsh/site-contrib/${PN}"
-	"DOC_DIR=${ED}/usr/share/doc/${PF}"
-)
-
-src_compile() {
-	emake "${MAKE_ARGS[@]}"
-}
-
-src_install() {
-	emake "${MAKE_ARGS[@]}" install
-	use doc && dodoc changelog.md COPYING.md HACKING.md INSTALL.md README.md release.md
-	use doc && readme.gentoo_create_doc
-	use doc || rm -rf "${D}/usr/share/doc"
-}
-
-pkg_postinst() {
-	use doc && readme.gentoo_print_elog
-	elog "${DOC_CONTENTS}"
-}
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-20180612-r1.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-20180612-r2.ebuild
similarity index 97%
rename from app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-20180612-r1.ebuild
rename to app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-20180612-r2.ebuild
index 584034e..8b3b13d 100644
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-20180612-r1.ebuild
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-20180612-r2.ebuild
@@ -14,7 +14,7 @@ PROPERTIES="live"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
 IUSE="+doc"
 
 DEPEND="app-shells/zsh"