--- a/make_release_packages	Thu Jun 18 16:17:47 2009 -0700
+++ b/make_release_packages	Thu Jun 11 18:35:41 2009 -0700
@@ -27,7 +27,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 # 
-# @(#)make_release_packages	1.72	09/06/02
+# @(#)make_release_packages	1.73	09/06/11
 #
 #	Create and fill a package staging area for X
 #
@@ -66,7 +66,7 @@
     SUNWxvnc SUNWxwacx SUNWxwcft SUNWxwdem SUNWxwdxm
     SUNWxwfnt SUNWxwfs SUNWxwfsw SUNWxwice SUNWxwinc
     SUNWxwman SUNWxwmod SUNWxwoft SUNWxwopt SUNWxwplr
-    SUNWxwplt SUNWxwpmn SUNWxwrtl SUNWxwslb SUNWxwsrv SUNWxwsvr
+    SUNWxwplt SUNWxwpmn SUNWxwrtl SUNWxwslb SUNWxwsvr
     SUNWxwts SUNWxwxft"
 
 # Some packages are only built for certain platforms currently

--- a/packages/upgrade-X	Thu Jun 18 16:17:47 2009 -0700
+++ b/packages/upgrade-X	Thu Jun 11 18:35:41 2009 -0700
@@ -2,7 +2,7 @@
 
 ###
 #
-# @(#)upgrade-X	1.53 09/06/02
+# @(#)upgrade-X	1.54 09/06/11
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 #
@@ -203,7 +203,6 @@
 	SUNWxwpmn
 	SUNWxwrtl
 	SUNWxwslb
-	SUNWxwsrv
 	SUNWxwsvr
 	SUNWxwts
 	SUNWxwxft
@@ -254,6 +253,9 @@
 #	   6826940 remove SUNWxorg-cfg (Xorg 1.6 upgrade)
 REM_PKGS+=" SUNWxorg-devel-docs SUNWxorg-cfg"
 
+# snv_118: 6850136 Removal of Xsun-based Xvfb & Xnest servers [PSARC 2008/033]
+REM_PKGS+=" SUNWxwsrv"
+
 # Check for shared SMF manifest scripts now required by our packages
 if [[ ! -f /usr/sadm/install/scripts/i.manifest ]] ; then
     fatal_error "Cannot install on a Nevada build older than nv_17.\n" \