--- a/make-rules/shared-macros.mk	Wed Mar 11 13:51:41 2015 -0700
+++ b/make-rules/shared-macros.mk	Mon Mar 16 09:18:04 2015 -0700
@@ -77,8 +77,11 @@
 
 SHELL=	/bin/bash
 
+# We want "nightly" as our publisher, to match other consolidations and
+# facilitate migrations.  G11N wants $(CONSOLIDATION)-localizable for
+# the localizable publisher.
 CONSOLIDATION =	userland
-PUBLISHER ?=	$(CONSOLIDATION)
+PUBLISHER ?=	nightly
 PUBLISHER_LOCALIZABLE ?=	$(CONSOLIDATION)-localizable
 
 ROOT =			/

--- a/tools/pkglintrc	Wed Mar 11 13:51:41 2015 -0700
+++ b/tools/pkglintrc	Mon Mar 16 09:18:04 2015 -0700
@@ -18,14 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 [pkglint]
 
 pkglint.ext.content = pkglint.userland
 
 # Used by the publisher_in_fmri method in .../tools/python/pkglint/userland.py
-userland.manifest002.allowed_pubs = userland userland-localizable
+userland.manifest002.allowed_pubs = nightly userland-localizable
 
 # 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