--- src/equery/equery.keworkdmask	2007-08-12 20:47:55.000000000 -0700
+++ src/equery/equery	2007-08-12 20:46:52.000000000 -0700
@@ -1370,10 +1370,11 @@ class CmdListPackages(Command):
 		if pkg.is_masked():
 			pkgmask = pkgmask + 3
 		keywords = pkg.get_env_var("KEYWORDS").split()
-		if "~" + gentoolkit.settings["ARCH"] in keywords:
-			pkgmask = pkgmask + 1
-		elif "-*" in keywords or "-" + gentoolkit.settings["ARCH"] in keywords:
-			pkgmask = pkgmask + 2
+		if gentoolkit.settings["ARCH"] not in keywords:
+			if "~" + gentoolkit.settings["ARCH"] in keywords:
+				pkgmask = pkgmask + 1
+			elif "-" + gentoolkit.settings["ARCH"] in keywords or "-*" in keywords:
+				pkgmask = pkgmask + 2
 		return pkgmask
 
 	def _generic_print(self, header, exclude, matches, rx, status):