--- a/tools/pkglintrc	Fri Apr 05 15:35:37 2013 -0700
+++ b/tools/pkglintrc	Tue Apr 09 10:37:15 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 [pkglint]
 
@@ -27,5 +27,8 @@
 # Used by the publisher_in_fmri method in .../tools/python/pkglint/userland.py
 userland.manifest002.allowed_pubs = userland userland-localizable
 
-# temporarily work around defect 18884
-pkglint.exclude = pkg.lint.pkglint_manifest.PkgManifestChecker.variants
+# turn off reporting of 'pkg.linted*' attributes in manifests.  We already
+# get a pkglint001.5 INFO message with the WARNING or ERROR that we have
+# deemed acceptable by adding the pkg.linted...=true attribute.
+pkglint.exclude = pkg.lint.pkglint_manifest.PkgManifestChecker.linted pkg.lint.pkglint_action.PkgActionChecker.linted
+