diff --git a/pentoo/pentoo-installer/Manifest b/pentoo/pentoo-installer/Manifest
index 519a0f126..7b5c8ed4f 100644
--- a/pentoo/pentoo-installer/Manifest
+++ b/pentoo/pentoo-installer/Manifest
@@ -15,6 +15,6 @@ AUX uefi-warn-unsupported.patch 967 SHA256 fab3b07ed2b798cae18f06e4a3e2632ac6420
 AUX useradd-bug70.patch 1662 SHA256 c24b1200771fb5ae891e3a0d425cb5e637e30679edea4623f54beb612152dbc2 SHA512 015c9bf8482b873e0c2da6b0510e1bc45e5a587d6dfdcdeaeafaed454efdcf7b3d3cda5c3f278d90c96b074c8e3dc57493965ccf6a9b62d57a43e42a4e39775e WHIRLPOOL 9d5a031f3a1f628dc4c2d370dc6b2e47001d8b9af01df0325afaa54a585b12bcf853ac6ebb7fafbf848f58ae2e28be69d004a92b35f0c1c968225577d68e5473
 AUX useradd_password_prompt.patch 607 SHA256 2279050c7461b26cec6983b4170bbf6586f99a8719f185612c6e35160686e643 SHA512 d7426d67c10965c5119c39f34eb7cc8627900cb89d76cacaca8e33dd289ce26d6e397c42888e7e0ef9f7d7e2396df3c18d2c666a6b1a3e0be6ea164ebcca11bc WHIRLPOOL 1f4f8c0bd2a2438c71c3a8e707fd2534fa845548e71178de1bf743e34a690635a305684a73d28a4dee73fb1412ddfff34679872a8dde7a5e60f34271f4688f76
 DIST pentoo-installer-0.1.4.tar.xz 22252 SHA256 f6bd14b60c1fb6c447587748320f8fa5e67284168de0c5570ccfc74c768aa9fc SHA512 82e7e538f080ba23e8965425fb75c019983baa17e305268bd7c8838e316ea11c42d575378067df4d417cbf52c9d908322fda559ce73ed2b5e14176701b66a7be WHIRLPOOL f5db053063f1155ab986eaea48c170b9ebbc6f90f9e720e3eb2fcf194ec07ef6aae342b2fcb602e302a13f903cdfbb871130a7fe9b4351c6bf84c151ea69dd02
-EBUILD pentoo-installer-0.1.4-r2.ebuild 754 SHA256 5051a7fd6954059a3db69958d379b39013ef8f61b1b5dc3512a29a51ed7907f7 SHA512 82e0e83c46b55f24aba9058980e6790eee5b7459aa3cd43782340484db6421786037a8bd312bb556cebde58ee64fbb9fa4cc921aa20a314cae7a59b8e52d1810 WHIRLPOOL 3621e5ed0ea39b0adf2defbb930b6db224b14fbb69a6d3fe32623c3497a705a721c5b88a3d95d62e126309211180161b18cbc1fdbf322f3fed26832ff51dfa0c
-EBUILD pentoo-installer-0.1.4-r4.ebuild 794 SHA256 5cb3168dbdcfce273336986551df4034d362917f910540472c9205d6ff5ab99b SHA512 c958e198bc09bee928dfcd477ec259b03306abef8ea77f0d943087cc8d16330e401623c6d712fa1182d152ea4a69d7382e9cf454e4b8ff7f39fe46ae33ed765f WHIRLPOOL f57defd5bf27aabc306fc56b225f7ac195eb604c8d46fb2fb7325a6933cf1b99376477a407cba1554fc9220d42566757a3e84843a660fa8ea9938e489fafa43d
-EBUILD pentoo-installer-20131013.ebuild 725 SHA256 cf2ee1b93cded8fc84a8716f978a7745d5367548bf6bcb1abc641eb26d79a57d SHA512 f040d6b9021f994854cb729cd1e56cf4681b419e022c7d1ad53605a1daba501702528954966949e881b6a7e674f3f1ec69e32c35816a2d7c668d891470d37be2 WHIRLPOOL 855f657eb89345c54abc8f9c89c576fe4a1bae4589d0d81b8b5f54566d7933474953ac494bdaf180c5ee9633e7501dffd94c36f438672802ce02172c855a3de1
+EBUILD pentoo-installer-0.1.4-r2.ebuild 754 SHA256 5653c4fccc50e750b603c10bb085a2c95784e94fc4351cc25784669fae953189 SHA512 d6ca1d1425804c7c60f3e8ae59f6943b588f21d69cd3d5cdf1e7fcdc20152e94641e9a4fb9c597636eb295f708c0e2cfd9b800ccb94d984ff5e216277cd6ef50 WHIRLPOOL 53b0279ee86bd5b465c6980f844fdd2c07099f5667290aea9ff275297aaa57118876fd87e9ba2cb08946a25195b4023dee1bb30e1682cc2824d60a8cd2d6660c
+EBUILD pentoo-installer-0.1.4-r4.ebuild 794 SHA256 06b9918f4df9ea00465db779e23a1b06dad79757befdb8745a22d489fb7cbd93 SHA512 a8516c250221fb143764e32602b6ef1b3dbee4b311bd8ff3d07204e012c887ef6f2124aa47e477e9dc98c22956f5bec6fe373dd64ee1a039ba829052e1796472 WHIRLPOOL 29b5a12854f1d339db98b56157f61854e3e76badc6c3d190f8b64ca19f1f52e9db011f03397d2d937463997814b68473852ab064a4a0af08391735994197f765
+EBUILD pentoo-installer-20131013.ebuild 723 SHA256 a17b3451ae5ac0a4a66b642019f0b01000cb66d9d2a8d0406fe414fd7a5697f4 SHA512 281493389cdcf2c95f7b67c35be6faefd16e05c9f1aaf4e750c11139faa08d58e586abe1eb89182893d8abe70d735302f97de92907ef5b540da416b0aaa9ea67 WHIRLPOOL 8b21219ea54df22f14b14bc841384937f1133c2f3d3a5e2a2b0e4dff7c8a44dde152dcabe8daf24b3fd457c48eae6c1017d9fb0c0808140916b4386ae6ef4cc1
diff --git a/pentoo/pentoo-installer/pentoo-installer-0.1.4-r2.ebuild b/pentoo/pentoo-installer/pentoo-installer-0.1.4-r2.ebuild
index 174ac7528..7b5adedc8 100644
--- a/pentoo/pentoo-installer/pentoo-installer-0.1.4-r2.ebuild
+++ b/pentoo/pentoo-installer/pentoo-installer-0.1.4-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit eutils
 
diff --git a/pentoo/pentoo-installer/pentoo-installer-0.1.4-r4.ebuild b/pentoo/pentoo-installer/pentoo-installer-0.1.4-r4.ebuild
index 9df606f3d..21b8fce24 100644
--- a/pentoo/pentoo-installer/pentoo-installer-0.1.4-r4.ebuild
+++ b/pentoo/pentoo-installer/pentoo-installer-0.1.4-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit eutils
 
diff --git a/pentoo/pentoo-installer/pentoo-installer-20131013.ebuild b/pentoo/pentoo-installer/pentoo-installer-20131013.ebuild
index 6e35d8c88..daa22ca03 100644
--- a/pentoo/pentoo-installer/pentoo-installer-20131013.ebuild
+++ b/pentoo/pentoo-installer/pentoo-installer-20131013.ebuild
@@ -14,7 +14,7 @@ ESVN_REVISION="5150"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"