diff --git a/dev-db/postgresql/postgresql-9.1.21.ebuild b/dev-db/postgresql/postgresql-9.1.21.ebuild
index c96e4dcf26db5..bfae69b319dcd 100644
--- a/dev-db/postgresql/postgresql-9.1.21.ebuild
+++ b/dev-db/postgresql/postgresql-9.1.21.ebuild
@@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.2.16.ebuild b/dev-db/postgresql/postgresql-9.2.16.ebuild
index 934152ea473d7..a98d42aa00bd5 100644
--- a/dev-db/postgresql/postgresql-9.2.16.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.16.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.3.12.ebuild b/dev-db/postgresql/postgresql-9.3.12.ebuild
index 511ff053d452b..5478056ce6bfb 100644
--- a/dev-db/postgresql/postgresql-9.3.12.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.12.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.4.7.ebuild b/dev-db/postgresql/postgresql-9.4.7.ebuild
index c904ab653ddc3..e5508def806a3 100644
--- a/dev-db/postgresql/postgresql-9.4.7.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.7.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.5.2.ebuild b/dev-db/postgresql/postgresql-9.5.2.ebuild
index fb8a3717dad59..dddafe1b8800c 100644
--- a/dev-db/postgresql/postgresql-9.5.2.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"