diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20170515.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20170515.ebuild
index b64983f176ee7..a68f18e863975 100644
--- a/sys-libs/libcxxrt/libcxxrt-0.0_p20170515.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-0.0_p20170515.ebuild
@@ -21,9 +21,9 @@ fi
 LICENSE="BSD-2"
 SLOT="0"
 if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm64 ~mips x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 ~mips x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 else
-	KEYWORDS="x86"
+	KEYWORDS="amd64 x86"
 fi
 IUSE="+libunwind +static-libs test"