diff --git a/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.15.0.ebuild b/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.15.0.ebuild
index 745515838..06cfcbb36 100644
--- a/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.15.0.ebuild
+++ b/dev-util/eclipse-sdk-bin/eclipse-sdk-bin-4.15.0.ebuild
@@ -17,8 +17,7 @@ SRC_URI="amd64? ( ${SRC_BASE}-x86_64.tar.gz&r=1 -> eclipse-java-${RNAME}-${SR}-l
 
 LICENSE="EPL-1.0"
 SLOT="4.15"
-KEYWORDS="~x86 amd64"
-IUSE=""
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=virtual/jdk-1.8
diff --git a/media-gfx/gfxboot/gfxboot-4.4.3-r2.ebuild b/media-gfx/gfxboot/gfxboot-4.4.3-r2.ebuild
index 9932c9d65..ba3a2dc16 100644
--- a/media-gfx/gfxboot/gfxboot-4.4.3-r2.ebuild
+++ b/media-gfx/gfxboot/gfxboot-4.4.3-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/gfxboot/${PV
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="x86 amd64"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/net-p2p/opentracker/opentracker-20170428-r1.ebuild b/net-p2p/opentracker/opentracker-20170428-r1.ebuild
index 6020649db..273fc4e71 100644
--- a/net-p2p/opentracker/opentracker-20170428-r1.ebuild
+++ b/net-p2p/opentracker/opentracker-20170428-r1.ebuild
@@ -13,7 +13,7 @@ EGIT_COMMIT="9c7be324f5a4306dd81eab2f982f87e2c42ffdf1"
 
 LICENSE="BEER-WARE"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="ipv6 blacklist +whitelist debug gzip restrict-stats live-sync log-network"
 
 RDEPEND=""
diff --git a/sys-apps/calculate-access/calculate-access-0.1.2.ebuild b/sys-apps/calculate-access/calculate-access-0.1.2.ebuild
index 678acb172..1af1c4ba7 100644
--- a/sys-apps/calculate-access/calculate-access-0.1.2.ebuild
+++ b/sys-apps/calculate-access/calculate-access-0.1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="x86 amd64"
+KEYWORDS="amd64 x86"
 IUSE="+client server"
 REQUIRED_USE="|| ( client server )"
 RDEPEND="sys-apps/openrc
diff --git a/x11-themes/papirus-smplayer-theme/papirus-smplayer-theme-20170119.ebuild b/x11-themes/papirus-smplayer-theme/papirus-smplayer-theme-20170119.ebuild
index 826e0d4aa..21baff6a5 100644
--- a/x11-themes/papirus-smplayer-theme/papirus-smplayer-theme-20170119.ebuild
+++ b/x11-themes/papirus-smplayer-theme/papirus-smplayer-theme-20170119.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 99999999 ]];then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="x86 amd64"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3"