diff --git a/dev-cpp/open-zwave/open-zwave-1.5.ebuild b/dev-cpp/open-zwave/open-zwave-1.5.ebuild
index c6d5520..ce7911e 100644
--- a/dev-cpp/open-zwave/open-zwave-1.5.ebuild
+++ b/dev-cpp/open-zwave/open-zwave-1.5.ebuild
@@ -10,16 +10,18 @@ EGIT_REPO_URI="https://github.com/OpenZWave/open-zwave.git"
 
 if [[ "$PV" == "9999" ]] ; then
 	inherit git-r3
+	KEYWORDS=""
 elif [[ "$PV" == "1.5_p20190124" ]] ; then
 	inherit git-r3
 	EGIT_COMMIT="791287063cddf9c30634ff924e56b654de77050a"
+	KEYWORDS="~amd64 ~x86"
 else
 	SRC_URI="https://github.com/OpenZWave/${PN}/archive/V${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/libudev"
diff --git a/dev-cpp/open-zwave/open-zwave-1.5_p20190124.ebuild b/dev-cpp/open-zwave/open-zwave-1.5_p20190124.ebuild
index c6d5520..ce7911e 100644
--- a/dev-cpp/open-zwave/open-zwave-1.5_p20190124.ebuild
+++ b/dev-cpp/open-zwave/open-zwave-1.5_p20190124.ebuild
@@ -10,16 +10,18 @@ EGIT_REPO_URI="https://github.com/OpenZWave/open-zwave.git"
 
 if [[ "$PV" == "9999" ]] ; then
 	inherit git-r3
+	KEYWORDS=""
 elif [[ "$PV" == "1.5_p20190124" ]] ; then
 	inherit git-r3
 	EGIT_COMMIT="791287063cddf9c30634ff924e56b654de77050a"
+	KEYWORDS="~amd64 ~x86"
 else
 	SRC_URI="https://github.com/OpenZWave/${PN}/archive/V${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/libudev"
diff --git a/dev-cpp/open-zwave/open-zwave-9999.ebuild b/dev-cpp/open-zwave/open-zwave-9999.ebuild
index c6d5520..ce7911e 100644
--- a/dev-cpp/open-zwave/open-zwave-9999.ebuild
+++ b/dev-cpp/open-zwave/open-zwave-9999.ebuild
@@ -10,16 +10,18 @@ EGIT_REPO_URI="https://github.com/OpenZWave/open-zwave.git"
 
 if [[ "$PV" == "9999" ]] ; then
 	inherit git-r3
+	KEYWORDS=""
 elif [[ "$PV" == "1.5_p20190124" ]] ; then
 	inherit git-r3
 	EGIT_COMMIT="791287063cddf9c30634ff924e56b654de77050a"
+	KEYWORDS="~amd64 ~x86"
 else
 	SRC_URI="https://github.com/OpenZWave/${PN}/archive/V${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/libudev"