diff --git a/mozilla/java/build.xml b/mozilla/java/build.xml
index 72360a08646..9c045d676f8 100644
--- a/mozilla/java/build.xml
+++ b/mozilla/java/build.xml
@@ -71,6 +71,9 @@
 
   <target name="dom">
 
+    <exec os="SunOS" dir="${basedir}/dom" executable="gmake" 
+                     failonerror="yes">
+    </exec>
     <exec os="Linux" dir="${basedir}/dom" executable="make" 
                      failonerror="yes">
     </exec>
@@ -93,6 +96,10 @@
 
     <ant dir="${basedir}/util" target="clean"/>
 
+    <exec os="SunOS" dir="${basedir}/dom" executable="make" 
+                     failonerror="yes">
+      <arg line="clean"/>
+    </exec>
     <exec os="Linux" dir="${basedir}/dom" executable="make" 
                      failonerror="yes">
       <arg line="clean"/>
diff --git a/mozilla/java/dom/jni/Makefile.in b/mozilla/java/dom/jni/Makefile.in
index 897381cdd9e..b92d86bcdac 100644
--- a/mozilla/java/dom/jni/Makefile.in
+++ b/mozilla/java/dom/jni/Makefile.in
@@ -93,7 +93,11 @@ JAVA_CLS= \
 	org.mozilla.dom.events.UIEventImpl \
  $(NULL)
 
+ifeq ($(OS_ARCH),Linux)
 INCLUDES	+= -I$(JAVAHOME)/include -I$(JAVAHOME)/include/linux
+else
+INCLUDES	+= -I$(JAVAHOME)/include -I$(JAVAHOME)/include/solaris
+endif
 
 JAVAH_PROG=$(JDKHOME)/bin/javah
 JAVAH_FLAGS=-jni -classpath $(CLASSPATH):$(JAVA_DESTPATH)
diff --git a/mozilla/java/webclient/build.xml b/mozilla/java/webclient/build.xml
index a97dc3b2342..953f40aa6aa 100644
--- a/mozilla/java/webclient/build.xml
+++ b/mozilla/java/webclient/build.xml
@@ -92,6 +92,8 @@
 
   <target name="compile.src_share" depends="compile.javah.headers">
 
+    <exec os="SunOS" dir="${basedir}/src_share" failonerror="yes" 
+                     executable="gmake"/>
     <exec os="Linux" dir="${basedir}/src_share" failonerror="yes" 
                      executable="make"/>
     <exec os="Windows 2000" dir="${basedir}/src_share" executable="nmake" 
@@ -174,6 +176,9 @@
 
   <target name="compile.src_moz" depends="compile.src_share">
 
+    <exec os="SunOS" dir="${basedir}/src_moz" executable="gmake" 
+                     failonerror="yes">
+    </exec>
     <exec os="Linux" dir="${basedir}/src_moz" executable="make" 
                      failonerror="yes">
     </exec>
@@ -182,6 +187,10 @@
       <arg line="-f makefile.win"/>
     </exec>
 
+    <exec os="SunOS" dir="${basedir}/src_moz" executable="gmake" 
+                     failonerror="yes">
+      <arg line="buildRunems"/>
+    </exec>
     <exec os="Linux" dir="${basedir}/src_moz" executable="make" 
                      failonerror="yes">
       <arg line="buildRunems"/>
@@ -198,6 +207,12 @@
 
     <ant antfile="build-tests.xml" target="clean"/>   
 
+    <exec os="SunOS" dir="${basedir}/src_moz" executable="gmake" 
+          failonerror="yes">
+
+      <arg line="clobber_all"/>
+
+    </exec>
     <exec os="Linux" dir="${basedir}/src_moz" executable="make" 
           failonerror="yes">
 
@@ -209,6 +224,12 @@
       <arg line="-f makefile.win clobber_all"/>
     </exec>
 
+    <exec os="SunOS" dir="${basedir}/src_share" executable="gmake"
+          failonerror="yes">
+
+      <arg line="clobber_all"/>
+
+    </exec>
     <exec os="Linux" dir="${basedir}/src_share" executable="make"
           failonerror="yes">