--- a/src/brand/pkgcreatezone	Sat Sep 03 23:03:45 2011 +0000
+++ b/src/brand/pkgcreatezone	Sat Sep 03 23:14:27 2011 +0000
@@ -503,52 +503,56 @@
 
 printf "$m_more\n"
 pkglist=""
-pkglist="$pkglist SUNWcnetr SUNWesu SUNWadmr SUNWadmap SUNWbzip SUNWgzip"
+pkglist="$pkglist pkg:/system/network pkg:/system/extended-system-utilities"
+pkglist="$pkglist pkg:/service/management/sysidtool pkg:/system/management/sysidtool"
+pkglist="$pkglist pkg:/compress/bzip2 pkg:/compress/gzip"
 
 #
-# Workaround: For now, SUNWipkg has no dependency on python, so we supply it.
+# Image Packaging System tools
 #
-pkglist="$pkglist SUNWPython26 SUNWipkg"
+pkglist="$pkglist pkg:/package/pkg"
 
 #
 # Get some diagnostic tools, truss, dtrace, etc.
 #
-pkglist="$pkglist SUNWtoo SUNWdtrc SUNWrcmdc SUNWbip"
+pkglist="$pkglist pkg:/developer/linker pkg:/developer/dtrace"
+pkglist="$pkglist pkg:/service/network/network-clients pkg:/network/ftp"
 
 #
 # Get at least one sensible shell, and vi
 #
-pkglist="$pkglist SUNWbash SUNWvim"
+pkglist="$pkglist pkg:/shell/bash pkg:/editor/vim"
 
 #
 # Get ssh and sshd.
 #
-pkglist="$pkglist SUNWsshcu SUNWssh SUNWsshd"
+pkglist="$pkglist pkg:/network/ssh/ssh-key pkg:/network/ssh"
+pkglist="$pkglist pkg:/service/network/ssh"
 
 #
 # Get some name services.
 #
-pkglist="$pkglist SUNWnis SUNWlldap"
+pkglist="$pkglist pkg:/system/network/nis pkg:/naming/ldap"
 
 #
 # Get nfs client and autofs; it's a pain not to have them.
 #
-pkglist="$pkglist SUNWnfsc SUNWatfs"
+pkglist="$pkglist pkg:/system/file-system/nfs pkg:/system/file-system/autofs"
 
 #
 # Get routing daemons.  They're required for useful exclusive stack zones.
 #
-pkglist="$pkglist SUNWroute"
+pkglist="$pkglist pkg:/system/network/routing"
 
 #
 # Get packages for TX zones if appropriate.
 #
-(( $brand_labeled == 1 )) && pkglist="$pkglist system/trusted/trusted-nonglobal"
+(( $brand_labeled == 1 )) && pkglist="$pkglist pkg:/system/trusted/trusted-nonglobal"
 
 #
 # Get man(1) but not the man pages
 #
-pkglist="$pkglist SUNWdoc"
+pkglist="$pkglist pkg:/text/doctools"
 
 #
 # Add in any extra packages requested by the user.