diff --git a/security/jss/pkg/solaris/Makefile b/security/jss/pkg/solaris/Makefile
index 8253c8e40e5e..e52078559259 100644
--- a/security/jss/pkg/solaris/Makefile
+++ b/security/jss/pkg/solaris/Makefile
@@ -2,7 +2,7 @@
 # Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"$Id: Makefile,v 1.3 2004/05/13 07:13:00 christophe.ravel.bugs%sun.com Exp $"
+#ident	"$Id: Makefile,v 1.4 2004/06/10 18:28:19 christophe.ravel.bugs%sun.com Exp $"
 #
 
 CORE_DEPTH = ../../..
@@ -27,12 +27,10 @@ PROTO = \
 	$(ROOT)/usr/share \
 	$(ROOT)/usr/share/lib \
 	$(ROOT)/usr/share/lib/mps \
-	$(ROOT)/usr/share/lib/mps/secv1 \
-	$(ROOT)/usr/share/lib/mps/secv1/sparcv9 \
+	$(ROOT)/usr/share/lib/mps/sparcv9 \
 	$(ROOT)/usr/lib \
 	$(ROOT)/usr/lib/mps \
-	$(ROOT)/usr/lib/mps/secv1 \
-	$(ROOT)/usr/lib/mps/secv1/sparcv9
+	$(ROOT)/usr/lib/mps/sparcv9
 
 include Makefile.com
 
@@ -51,13 +49,13 @@ $(ROOT) $(ROOT)/%:
 	mkdir -p $@
 
 ifdef USE_64
-$(ROOT)/usr/lib/mps/secv1/sparcv9: $(ROOT)/usr/lib
+$(ROOT)/usr/lib/mps/sparcv9: $(ROOT)/usr/lib
 	echo "target=$(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_XPCLASS_JAR)"
-	$(LN) -sf ../../../../../$(DIST)/lib $@ 
-	cp $(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_XPCLASS_JAR) $(ROOT)/usr/share/lib/mps/secv1/sparcv9/jss3.jar
+	$(LN) -sf ../../../../$(DIST)/lib $@ 
+	cp $(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_XPCLASS_JAR) $(ROOT)/usr/share/lib/mps/sparcv9/jss3.jar
 else
-$(ROOT)/usr/lib/mps/secv1: $(ROOT)/usr/lib
+$(ROOT)/usr/lib/mps: $(ROOT)/usr/lib
 	echo "target=$(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_XPCLASS_JAR)"
-	$(LN) -sf ../../../../$(DIST)/lib $@
-	cp $(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_XPCLASS_JAR) $(ROOT)/usr/share/lib/mps/secv1/jss3.jar
+	$(LN) -sf ../../../$(DIST)/lib $@
+	cp $(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_XPCLASS_JAR) $(ROOT)/usr/share/lib/mps/jss3.jar
 endif
diff --git a/security/jss/pkg/solaris/SUNWjss/prototype_com b/security/jss/pkg/solaris/SUNWjss/prototype_com
index 872cc921d1ce..389be28a0fdb 100644
--- a/security/jss/pkg/solaris/SUNWjss/prototype_com
+++ b/security/jss/pkg/solaris/SUNWjss/prototype_com
@@ -2,7 +2,7 @@
 # Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"$Id: prototype_com,v 1.3 2004/05/13 07:13:00 christophe.ravel.bugs%sun.com Exp $"
+#ident	"$Id: prototype_com,v 1.4 2004/06/10 18:28:19 christophe.ravel.bugs%sun.com Exp $"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -31,5 +31,7 @@ d none usr/share 755 root sys
 d none usr/share/lib 755 root sys
 d none usr/share/lib/mps 755 root bin
 d none usr/share/lib/mps/secv1 755 root bin
-f none usr/lib/mps/secv1/libjss3.so 755 root bin
-f none usr/share/lib/mps/secv1/jss3.jar 644 root bin
+f none usr/lib/mps/libjss3.so 755 root bin
+f none usr/share/lib/mps/jss3.jar 644 root bin
+s none usr/lib/mps/secv1/libjss3.so=../libjss3.so
+s none usr/share/lib/mps/secv1/jss3.jar=../jss3.jar
diff --git a/security/jss/pkg/solaris/SUNWjssx/prototype_sparc b/security/jss/pkg/solaris/SUNWjssx/prototype_sparc
index f7319a0cbf38..675341970c9f 100644
--- a/security/jss/pkg/solaris/SUNWjssx/prototype_sparc
+++ b/security/jss/pkg/solaris/SUNWjssx/prototype_sparc
@@ -2,7 +2,7 @@
 # Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"$Id: prototype_sparc,v 1.3 2004/05/13 07:13:01 christophe.ravel.bugs%sun.com Exp $"
+#ident	"$Id: prototype_sparc,v 1.4 2004/06/10 18:28:19 christophe.ravel.bugs%sun.com Exp $"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -27,8 +27,13 @@
 #
 #
 # SUNWjssx
+s none usr/lib/mps/64=sparcv9
 s none usr/lib/mps/secv1/64=sparcv9
+d none usr/lib/mps/sparcv9 755 root bin
+d none usr/share/lib/mps/sparcv9 755 root bin
 d none usr/lib/mps/secv1/sparcv9 755 root bin
 d none usr/share/lib/mps/secv1/sparcv9 755 root bin
-f none usr/lib/mps/secv1/sparcv9/libjss3.so 755 root bin
-f none usr/share/lib/mps/secv1/sparcv9/jss3.jar 644 root bin
+f none usr/lib/mps/sparcv9/libjss3.so 755 root bin
+f none usr/share/lib/mps/sparcv9/jss3.jar 644 root bin
+s none usr/lib/mps/secv1/sparcv9/libjss3.so=../../sparcv9/libjss3.so
+s none usr/share/lib/mps/secv1/sparcv9/jss3.jar=../../sparcv9/jss3.jar