--- a/usr/src/pkg/manifests/SUNWbeadm.mf	Fri Jul 09 11:39:06 2010 -0700
+++ b/usr/src/pkg/manifests/SUNWbeadm.mf	Fri Jul 09 16:13:05 2010 -0700
@@ -26,5 +26,13 @@
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
 set name=variant.opensolaris.zone value=global value=nonglobal
+#
+# We need to un-incorporate beadm from the install incorporation in
+# preparation for it moving into the ON consolidation and thus becoming
+# part of the osnet incorporation.  This will allow upgrades to work
+# as one would expect when upgrading to a build that has beadm moving
+# to the osnet incorporation
+#
+set name=org.opensolaris.noincorp value=true
 depend fmri=pkg:/install/[email protected],5.11-0.133 type=require
 

--- a/usr/src/pkg/manifests/install-beadm.mf	Fri Jul 09 11:39:06 2010 -0700
+++ b/usr/src/pkg/manifests/install-beadm.mf	Fri Jul 09 16:13:05 2010 -0700
@@ -26,8 +26,17 @@
 set name=pkg.description value="Boot Environment Management Tool"
 set name=pkg.summary value="beadm utility"
 set name=info.classification value=org.opensolaris.category.2008:System/Core
+#
+# We need to un-incorporate beadm from the install incorporation in
+# preparation for it moving into the ON consolidation and thus becoming
+# part of the osnet incorporation.  This will allow upgrades to work
+# as one would expect when upgrading to a build that has beadm moving
+# to the osnet incorporation
+#
+set name=org.opensolaris.noincorp value=true
 set name=variant.arch value=$(ARCH)
 set name=variant.opensolaris.zone value=global value=nonglobal
+depend fmri=pkg:/runtime/python-26 type=require
 dir path=etc group=sys
 dir path=etc/security group=sys
 dir path=etc/security/exec_attr.d group=sys