diff --git a/mozilla/security/jss/pkg/solaris/Makefile b/mozilla/security/jss/pkg/solaris/Makefile
index 87c4a734767..6733fea80d6 100644
--- a/mozilla/security/jss/pkg/solaris/Makefile
+++ b/mozilla/security/jss/pkg/solaris/Makefile
@@ -2,7 +2,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"$Id: Makefile,v 1.10 2004-10-06 21:49:45 christophe.ravel.bugs%sun.com Exp $"
+#ident	"$Id: Makefile,v 1.11 2004-10-08 04:15:23 christophe.ravel.bugs%sun.com Exp $"
 #
 
 CORE_DEPTH = ../../..
@@ -28,8 +28,24 @@ ifeq ($(MACH),sparc)
 	$(ROOT)/usr/lib/mps/sparcv9
 endif
 
-DIST64 = $(shell echo $(DIST) | sed -e "s|_OPT|_64_OPT|g" -e "s|_DBG|_64_DBG|g")
-OBJ32 = $(shell basename $(DIST))
+ifeq ($(USE_64), 1)
+ifeq ($(MACH), sparc)
+# Sparc
+	PROTO += $(ROOT)/usr/lib/mps/sparcv9 \
+	$(ROOT)/usr/share/lib/mps/sparcv9
+else
+# AMD64
+	PROTO += $(ROOT)/usr/lib/mps/amd64 \
+	$(ROOT)/usr/share/lib/mps/amd64
+endif
+	DIST64 = $(DIST)
+	DIST32 = $(shell echo $(DIST) | sed -e "s|_64_OPT|_OPT|g" -e "s|_64_DBG|_DBG|g")
+else
+	DIST32 = $(DIST)
+	DIST64 = $(shell echo $(DIST) | sed -e "s|_OPT|_64_OPT|g" -e "s|_DBG|_64_DBG|g")
+endif
+
+OBJ32 = $(shell basename $(DIST32))
 OBJ64 = $(shell basename $(DIST64))
 
 ifeq ($(BUILD_OPT),1)
@@ -67,6 +83,15 @@ ifdef JSS3_LOCATION
 	$(CP) $(JSS3_LOCATION)/$(IMPORT_XPCLASS_JAR) $@/jss3.jar
 endif
 
+$(ROOT)/usr/lib/mps/amd64:
+	mkdir -p $@
+	$(CP) -r $(DIST64)/lib/*.so $@ 
+
+$(ROOT)/usr/share/lib/mps/amd64:
+	echo "target=$(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_JSS_JAR)"
+	mkdir -p $@
+	$(CP) $(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_JSS_JAR) $@/jss4.jar
+
 $(ROOT)/usr/lib/mps:
 	mkdir -p $@
 	$(CP) -r $(DIST)/lib/*.so $@
diff --git a/mozilla/security/jss/pkg/solaris/Makefile.targ b/mozilla/security/jss/pkg/solaris/Makefile.targ
index 5b21c2cb5f8..73023ee1656 100644
--- a/mozilla/security/jss/pkg/solaris/Makefile.targ
+++ b/mozilla/security/jss/pkg/solaris/Makefile.targ
@@ -2,9 +2,11 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"$Id: Makefile.targ,v 1.5 2004-07-22 17:52:04 christophe.ravel.bugs%sun.com Exp $"
+#ident	"$Id: Makefile.targ,v 1.6 2004-10-08 04:15:23 christophe.ravel.bugs%sun.com Exp $"
 #
 
+include ../proto64.mk
+
 ifdef JSS3_LOCATION
 	PROTOTYPE_BASE=prototype3_
 else
@@ -14,9 +16,12 @@ endif
 pkginfo: pkginfo.tmpl ../awk_pkginfo
 	$(RM) $@; nawk -f ../awk_pkginfo $@.tmpl > $@
 
-pkg: $(PKGARCHIVE) pkgdepend $(PROTOTYPE_BASE)$(MACH)
+prototype: prototype_$(MACH)
 	@echo "Using $(PROTOTYPE_BASE)$(MACH) to build package $(PACKAGE)"
-	pkgmk -f $(PROTOTYPE_BASE)$(MACH) -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE)
+	cat $(PROTOTYPE_BASE)$(MACH) | sed $(sed_proto64) >prototype
+
+pkg: $(PKGARCHIVE) pkgdepend prototype
+	pkgmk -f prototype -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE)
 
 $(PKGARCHIVE):
 	[ -d $(PKGARCHIVE) ] || mkdir -p $(PKGARCHIVE)
diff --git a/mozilla/security/jss/pkg/solaris/SUNWjss/prototype3_sparc b/mozilla/security/jss/pkg/solaris/SUNWjss/prototype3_sparc
index 06760aaadef..6cd60193f8c 100644
--- a/mozilla/security/jss/pkg/solaris/SUNWjss/prototype3_sparc
+++ b/mozilla/security/jss/pkg/solaris/SUNWjss/prototype3_sparc
@@ -2,7 +2,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"$Id: prototype3_sparc,v 1.1 2004-07-21 23:22:23 christophe.ravel.bugs%sun.com Exp $"
+#ident	"$Id: prototype3_sparc,v 1.2 2004-10-08 04:15:24 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,18 +27,18 @@
 #
 #
 # SUNWjss
-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/sparcv9/libjss4.so 755 root bin
-f none usr/share/lib/mps/sparcv9/jss4.jar 644 root bin
-s none usr/lib/mps/secv1/sparcv9/libjss4.so=../../sparcv9/libjss4.so
-s none usr/share/lib/mps/secv1/sparcv9/jss4.jar=../../sparcv9/jss4.jar
-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
+#64#s none usr/lib/mps/64=sparcv9
+#64#s none usr/lib/mps/secv1/64=sparcv9
+#64#d none usr/lib/mps/sparcv9 755 root bin
+#64#d none usr/share/lib/mps/sparcv9 755 root bin
+#64#d none usr/lib/mps/secv1/sparcv9 755 root bin
+#64#d none usr/share/lib/mps/secv1/sparcv9 755 root bin
+#64#f none usr/lib/mps/sparcv9/libjss4.so 755 root bin
+#64#f none usr/share/lib/mps/sparcv9/jss4.jar 644 root bin
+#64#s none usr/lib/mps/secv1/sparcv9/libjss4.so=../../sparcv9/libjss4.so
+#64#s none usr/share/lib/mps/secv1/sparcv9/jss4.jar=../../sparcv9/jss4.jar
+#64#f none usr/lib/mps/sparcv9/libjss3.so 755 root bin
+#64#f none usr/share/lib/mps/sparcv9/jss3.jar 644 root bin
+#64#s none usr/lib/mps/secv1/sparcv9/libjss3.so=../../sparcv9/libjss3.so
+#64#s none usr/share/lib/mps/secv1/sparcv9/jss3.jar=../../sparcv9/jss3.jar
 
diff --git a/mozilla/security/jss/pkg/solaris/SUNWjss/prototype_i386 b/mozilla/security/jss/pkg/solaris/SUNWjss/prototype_i386
index 58ac6e9e0ab..f62af7fce6b 100644
--- a/mozilla/security/jss/pkg/solaris/SUNWjss/prototype_i386
+++ b/mozilla/security/jss/pkg/solaris/SUNWjss/prototype_i386
@@ -2,7 +2,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"$Id: prototype_i386,v 1.3 2004-06-14 23:24:58 christophe.ravel.bugs%sun.com Exp $"
+#ident	"$Id: prototype_i386,v 1.4 2004-10-08 04:15:24 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,3 +27,13 @@
 #
 #
 # SUNWjss
+#64#s none usr/lib/mps/64=amd64
+#64#s none usr/lib/mps/secv1/64=amd64
+#64#d none usr/lib/mps/amd64 755 root bin
+#64#d none usr/share/lib/mps/amd64 755 root bin
+#64#d none usr/lib/mps/secv1/amd64 755 root bin
+#64#d none usr/share/lib/mps/secv1/amd64 755 root bin
+#64#f none usr/lib/mps/amd64/libjss4.so 755 root bin
+#64#f none usr/share/lib/mps/amd64/jss4.jar 644 root bin
+#64#s none usr/lib/mps/secv1/amd64/libjss4.so=../../amd64/libjss4.so
+#64#s none usr/share/lib/mps/secv1/amd64/jss4.jar=../../amd64/jss4.jar
diff --git a/mozilla/security/jss/pkg/solaris/SUNWjss/prototype_sparc b/mozilla/security/jss/pkg/solaris/SUNWjss/prototype_sparc
index e02acce5771..81300346e62 100644
--- a/mozilla/security/jss/pkg/solaris/SUNWjss/prototype_sparc
+++ b/mozilla/security/jss/pkg/solaris/SUNWjss/prototype_sparc
@@ -2,7 +2,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"$Id: prototype_sparc,v 1.4 2004-07-21 23:22:23 christophe.ravel.bugs%sun.com Exp $"
+#ident	"$Id: prototype_sparc,v 1.5 2004-10-08 04:15:24 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,14 +27,14 @@
 #
 #
 # SUNWjss
-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/sparcv9/libjss4.so 755 root bin
-f none usr/share/lib/mps/sparcv9/jss4.jar 644 root bin
-s none usr/lib/mps/secv1/sparcv9/libjss4.so=../../sparcv9/libjss4.so
-s none usr/share/lib/mps/secv1/sparcv9/jss4.jar=../../sparcv9/jss4.jar
+#64#s none usr/lib/mps/64=sparcv9
+#64#s none usr/lib/mps/secv1/64=sparcv9
+#64#d none usr/lib/mps/sparcv9 755 root bin
+#64#d none usr/share/lib/mps/sparcv9 755 root bin
+#64#d none usr/lib/mps/secv1/sparcv9 755 root bin
+#64#d none usr/share/lib/mps/secv1/sparcv9 755 root bin
+#64#f none usr/lib/mps/sparcv9/libjss4.so 755 root bin
+#64#f none usr/share/lib/mps/sparcv9/jss4.jar 644 root bin
+#64#s none usr/lib/mps/secv1/sparcv9/libjss4.so=../../sparcv9/libjss4.so
+#64#s none usr/share/lib/mps/secv1/sparcv9/jss4.jar=../../sparcv9/jss4.jar
 
diff --git a/mozilla/security/jss/pkg/solaris/proto64.mk b/mozilla/security/jss/pkg/solaris/proto64.mk
new file mode 100644
index 00000000000..725e683890b
--- /dev/null
+++ b/mozilla/security/jss/pkg/solaris/proto64.mk
@@ -0,0 +1,14 @@
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident  "$Id: proto64.mk,v 1.1 2004-10-08 04:16:06 christophe.ravel.bugs%sun.com Exp $"
+#
+
+ifeq ($(USE_64), 1)
+  # Remove 64 tag
+  sed_proto64='s/\#64\#//g'
+else
+  # Strip 64 lines
+  sed_proto64='/\#64\#/d'
+endif