diff --git a/mozilla/security/coreconf/jdk.mk b/mozilla/security/coreconf/jdk.mk
index 755243fcaa2..79b8b766292 100644
--- a/mozilla/security/coreconf/jdk.mk
+++ b/mozilla/security/coreconf/jdk.mk
@@ -139,7 +139,7 @@ ifeq ($(OS_ARCH), SunOS)
 	INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
 
 	# (3) specify "linker" information
-	JAVA_CPU = sparc
+	JAVA_CPU = $(shell uname -p)
 
 ifeq ($(JDK_VERSION), 1.1)
 	JAVA_LIBDIR = lib/$(JAVA_CPU)
@@ -153,8 +153,9 @@ endif
 	JAVA_CLIBS = -lthread
 
 ifneq ($(JDK_VERSION), 1.1)
-	JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic -ljvm
-	JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR) -ljava
+	JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic
+	JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)
+	JAVA_LIBS += -ljvm -ljava
 else
 	JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/$(JDK_THREADING_MODEL) -ljava
 endif