diff --git a/mozilla/java/webclient/src_moz/Makefile.in b/mozilla/java/webclient/src_moz/Makefile.in
index 8801dd0f818..f3099b38610 100644
--- a/mozilla/java/webclient/src_moz/Makefile.in
+++ b/mozilla/java/webclient/src_moz/Makefile.in
@@ -159,13 +159,10 @@ ifeq ($(OS_ARCH),Linux)
 endif
 	rm -f runem_unix_commercial
 	@echo "#!/bin/csh -x" >> runem_unix_commercial
-	@echo ln -s -f "$$"MOZILLA_FIVE_HOME/javadev/lib/lib$(LIBRARY_NAME).so "$$"MOZILLA_FIVE_HOME/lib$(LIBRARY_NAME).so >> runem_unix_commercial
-	@echo ln -s -f "$$"MOZILLA_FIVE_HOME/javadev/lib/lib$(LIBRARY_NAME)stub.so "$$"MOZILLA_FIVE_HOME/lib$(LIBRARY_NAME)stub.so >> runem_unix_commercial
-	@echo cp -f "$$"MOZILLA_FIVE_HOME/javadev/lib/libjavadom.so "$$"MOZILLA_FIVE_HOME/components >> runem_unix_commercial
-	@echo ln -s -f "$$"MOZILLA_FIVE_HOME/javadev/lib/libjavadomjni.so "$$"MOZILLA_FIVE_HOME/libjavadomjni.so >> runem_unix_commercial
+	@echo ln -s -f "$$"MOZILLA_FIVE_HOME/javadev/lib/libjavadom.so "$$"MOZILLA_FIVE_HOME/components/libjavadom.so >> runem_unix_commercial
 	@echo setenv CLASSPATH "$$"MOZILLA_FIVE_HOME/javadev/lib/$(LIBRARY_NAME)_$(PACKAGE_VER).jar>> runem_unix_commercial
-	@echo setenv LD_LIBRARY_PATH "$$"MOZILLA_FIVE_HOME/javadev/lib:"$$"LD_LIBRARY_PATH>> runem_unix_commercial
-	@echo $(PERL) ./runem.pl org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) $1 >> runem_unix_commercial
+	@echo setenv LD_LIBRARY_PATH "$$"MOZILLA_FIVE_HOME'"':'"'"$$"MOZILLA_FIVE_HOME/components'"':'"'"$$"MOZILLA_FIVE_HOME/javadev/lib'"':'"'"$$"LD_LIBRARY_PATH>> runem_unix_commercial
+	@echo "$$"JDKHOME/bin/java org.mozilla.webclient.test.EmbeddedMozilla "$$"MOZILLA_FIVE_HOME "$$"1 >> runem_unix_commercial
 	mkdir -p $(PACKAGE_EXAMPLE)
 	chmod 775 $(PACKAGE_EXAMPLE)
 	cp -f $(DIST)/bin/lib$(LIBRARY_NAME).so $(PACKAGE_LIB)
@@ -177,12 +174,13 @@ endif
 	chmod 775 $(PACKAGE_LIB)/libjavadomjni.so
 	chmod 775 $(PACKAGE_LIB)/libjavadom.so
 	cp -f $(DEPTH)/java/webclient/src_moz/runem_unix_commercial $(PACKAGE_EXAMPLE)/runem
-	cp -f ../src_share/runem.pl $(PACKAGE_EXAMPLE)/runem.pl
+
 	chmod 775  $(PACKAGE_EXAMPLE)/runem
-	cp -f $(DEPTH)/java/webclient/src_moz/install_win32.js $(DIST)/install.js
+	cp -f $(DEPTH)/java/webclient/src_moz/install_unix.js $(DIST)/install.js
 ifeq ($(OS_ARCH),Linux)
 	cd $(DIST); zip -r $(LIBRARY_NAME)_$(PACKAGE_VER)_linux.xpi install.js javadev
 else
+	cd $(DIST); zip -r $(LIBRARY_NAME)_$(PACKAGE_VER)_solaris.xpi install.js javadev
 endif
 endif
 ifeq ($(PACKAGE_BUILD),)