diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 3b89d0f1559ee..926766099c9d1 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -23,12 +23,12 @@ mail-client/novell-groupwise-client
 
 # AMD64 Team <amd64@gentoo.org>
 # Mask packages that rely on amd64 multilib
-=app-editors/emacs-18*
 >=app-i18n/atokx3-3.0.0
 app-accessibility/mbrola
 app-accessibility/perlbox-voice
 app-arch/stuffit
 app-benchmarks/cpuburn
+app-editors/emacs:18
 app-emulation/crossover-bin
 app-emulation/playonlinux
 app-emulation/q4wine
diff --git a/profiles/default/linux/musl/amd64/package.mask b/profiles/default/linux/musl/amd64/package.mask
index 2d46a562aced7..e6bfd5387f924 100644
--- a/profiles/default/linux/musl/amd64/package.mask
+++ b/profiles/default/linux/musl/amd64/package.mask
@@ -3,5 +3,5 @@
 
 # Ulrich Müller <ulm@gentoo.org> (18 Mar 2013)
 # Packages that rely on multilib
-=app-editors/emacs-18*
+app-editors/emacs:18
 net-misc/icaclient
diff --git a/profiles/default/linux/uclibc/amd64/package.mask b/profiles/default/linux/uclibc/amd64/package.mask
index a864e077b43cd..82dd641f675f5 100644
--- a/profiles/default/linux/uclibc/amd64/package.mask
+++ b/profiles/default/linux/uclibc/amd64/package.mask
@@ -7,7 +7,7 @@ app-accessibility/mbrola
 app-accessibility/perlbox-voice
 app-arch/stuffit
 app-benchmarks/cpuburn
-=app-editors/emacs-18*
+app-editors/emacs:18
 app-emulation/crossover-bin
 app-emulation/playonlinux
 app-emulation/q4wine
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index 554b7b3ca5da8..35d3ac39c5199 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -26,7 +26,7 @@ app-accessibility/mbrola
 app-accessibility/perlbox-voice
 app-arch/stuffit
 app-benchmarks/cpuburn
-=app-editors/emacs-18*
+app-editors/emacs:18
 app-emulation/crossover-bin
 app-emulation/genymotion-bin
 app-emulation/playonlinux