diff --git a/mozilla/config/config.mak b/mozilla/config/config.mak
index 407b897117f..d5b3d588545 100644
--- a/mozilla/config/config.mak
+++ b/mozilla/config/config.mak
@@ -47,6 +47,28 @@ WINOS=$(WINOS: =)^
 !if [del osuname.inc]
 !endif
 
+!if "$(STAND_ALONE_JAVA)" == "1"
+LCFLAGS=$(LCFLAGS) -DSTAND_ALONE_JAVA
+!endif
+
+!ifdef MOZ_JAVA
+MOZ_JAVA_FLAG=-DJAVA
+!ifdef MOZ_OJI
+!error You can't define both MOZ_JAVA and MOZ_OJI anymore. 
+!endif
+JAVA_OR_OJI = 1
+JAVA_OR_NSJVM = 1
+!endif
+
+!ifdef NSJVM
+JAVA_OR_NSJVM = 1
+!endif
+
+!ifdef MOZ_OJI
+LCFLAGS=$(LCFLAGS) -DOJI
+JAVA_OR_OJI=1
+!endif
+
 ## Include support for MOZ_LITE/MOZ_MEDIUM
 include <$(DEPTH)/config/liteness.mak>
 
@@ -130,23 +152,6 @@ INCS=$(INCS) -I$(DEPTH)\include -I$(DIST)\include \
 INCS=$(INCS) -I$(DEPTH)\lib\liblayer\include
 !endif 
 
-!if "$(STAND_ALONE_JAVA)" == "1"
-LCFLAGS=$(LCFLAGS) -DSTAND_ALONE_JAVA
-!endif
-
-!if defined(MOZ_JAVA)
-MOZ_JAVA_FLAG=-DJAVA
-!if defined(MOZ_OJI)
-!error You can't define both MOZ_JAVA and MOZ_OJI anymore. 
-!endif
-JAVA_OR_OJI=1
-!endif
-
-!if defined(MOZ_OJI)
-LCFLAGS=$(LCFLAGS) -DOJI
-JAVA_OR_OJI=1
-!endif
-
 # Perhaps we should add MOZ_LITENESS_FLAGS to 16 bit build
 !if "$(MOZ_BITS)" == "16"
 CFLAGS=$(MOZ_JAVA_FLAG) -DMOCHA -DLAYERS -DEDITOR $(OS_CFLAGS) $(MOZ_CFLAGS)
diff --git a/mozilla/config/java.inc b/mozilla/config/java.inc
index 58dda8412a9..1b0b904a758 100644
--- a/mozilla/config/java.inc
+++ b/mozilla/config/java.inc
@@ -198,4 +198,37 @@ export:: $(JRI_GEN)
 !endif # JAVA_OR_OJI
 !endif
 
+
+!ifdef JNI_GEN
+!ifdef JAVA_OR_OJI
+#//------------------------------------------------------------------------
+#//
+#// Rule to generate JNI header files using javah.
+#//
+#//------------------------------------------------------------------------
+$(JNI_GEN):: display_jni_header_msg
+    !echo $(JAVAH) -jni -d _jni $@
+    !$(JAVAH) -jni -d _jni $@
+
+!ifdef NSBUILDROOT
+LINCS = $(LINCS) -I$(JNI_GEN_DIR) -I$(XPDIST)
+!else
+LINCS = $(LINCS) -I$(JNI_GEN_DIR)
+!endif
+
+display_jni_header_msg:
+	echo +++ make: Generating JNI header files...
+
+!ifdef MOZ_GENMAC
+$(JNI_GEN)::display_jni_header_msg_mac $(MAC_JAVA_HEADERS_DIR)
+        echo +++ make: creating JRI header for $@
+        !$(JAVAH) -mac -jni -d $(MAC_JAVA_HEADERS_DIR)/_jni $@
+         
+display_jni_header_msg_mac:
+        echo +++ make: Generating Macintosh java JNI header files +++
+!endif
+!endif # JAVA_OR_OJI
+export:: $(JNI_GEN)
+!endif # JNI_GEN
+
 !endif # CONFIG_JAVA_INC
diff --git a/mozilla/config/liteness.mak b/mozilla/config/liteness.mak
index 1f1d8133eda..ff0101e0d0a 100644
--- a/mozilla/config/liteness.mak
+++ b/mozilla/config/liteness.mak
@@ -174,7 +174,7 @@ MOZ_SMARTUPDATE=1
 MOZ_LITENESS_FLAGS=$(MOZ_LITENESS_FLAGS) -DMOZ_SMARTUPDATE
 !endif
 
-!ifdef MOZ_OJI
+!ifdef JAVA_OR_NSJVM    # fix -- su can't depend on java
 MOZ_SMARTUPDATE=1
 MOZ_LITENESS_FLAGS=$(MOZ_LITENESS_FLAGS) -DMOZ_SMARTUPDATE
 !endif
diff --git a/mozilla/config/rules.mak b/mozilla/config/rules.mak
index 721c70c03bb..62283c29940 100644
--- a/mozilla/config/rules.mak
+++ b/mozilla/config/rules.mak
@@ -43,7 +43,7 @@ JDK_STUB_DIR=_stubs
 !endif
 
 !if !defined(JMC_GEN_DIR)
-!if defined(JAVA_OR_OJI)
+!if defined(JAVA_OR_NSJVM)
 JMC_GEN_DIR=_jmc
 !else
 JMC_GEN_DIR=$(LOCAL_JMC_SUBDIR)
@@ -54,6 +54,10 @@ JMC_GEN_DIR=$(LOCAL_JMC_SUBDIR)
 JRI_GEN_DIR=_jri
 !endif
 
+!if !defined(JNI_GEN_DIR)
+JNI_GEN_DIR=_jni
+!endif
+
 
 MANIFEST_LEVEL=MACROS
 !IF EXIST(manifest.mn) && !defined(IGNORE_MANIFEST)
@@ -231,7 +235,7 @@ $(TMPDIR):
 	-mkdir $(TMPDIR)
 
 !ifdef JDIRS
-!if defined(JAVA_OR_OJI)
+!if defined(JAVA_OR_NSJVM)
 #//------------------------------------------------------------------------
 #//
 #// Rule to recursively make all subdirectories specified by the JDIRS target
@@ -274,7 +278,7 @@ $(JDIRS)::
 clobber::
     -for %g in ($(JDIRS)) do $(RM_R) $(XPDIST:/=\)/classes/%g
 
-!endif # JAVA_OR_OJI
+!endif # JAVA_OR_NSJVM
 !endif # JDIRS
 
 !if defined(INSTALL_FILE_LIST) && defined(INSTALL_DIR)
@@ -477,7 +481,7 @@ include <$(DEPTH)/config/java.inc>
 #// JSRCS   .java files to be compiled (.java extension included)
 #//
 #//------------------------------------------------------------------------
-!if defined(JAVA_OR_OJI)
+!if defined(JAVA_OR_NSJVM)
 !if defined(JSRCS)
 
 JSRCS_DEPS = $(JAVA_DESTPATH) $(JAVA_DESTPATH)\$(PACKAGE) $(TMPDIR)
@@ -525,7 +529,7 @@ export:: $(JMCSRCDIR)
 clobber::
     -for %f in ($(JMC_EXPORT)) do $(RM) $(JMCSRCDIR:/=\)\%f.class
 !endif # JMC_EXPORT
-!endif # JAVA_OR_OJI
+!endif # JAVA_OR_NSJVM
 
 #//------------------------------------------------------------------------
 #//
@@ -535,7 +539,7 @@ clobber::
 #//         Generated .h and .c files go to JMC_GEN_DIR
 #//
 #//------------------------------------------------------------------------
-!if defined(JAVA_OR_OJI)
+!if defined(JAVA_OR_NSJVM)
 
 !if defined(JMC_GEN)
 export:: $(JMC_HEADERS)
@@ -559,7 +563,7 @@ export:: $(JMC_STUBS) $(OBJDIR) $(JMC_OBJS)
 
 !endif # CCJMC
 !endif # JMC_GEN
-!endif # JAVA_OR_OJI
+!endif # JAVA_OR_NSJVM
 
 
 #//------------------------------------------------------------------------
@@ -580,9 +584,12 @@ clobber::
 #//------------------------------------------------------------------------
 #//  These rules must follow all lines that define the macros they use
 #//------------------------------------------------------------------------
-!if defined(JAVA_OR_OJI)
+!if defined(JAVA_OR_NSJVM)
 GARBAGE	= $(JMC_GEN_DIR) $(JMC_HEADERS) $(JMC_STUBS) \
 	  $(JDK_STUB_DIR) $(JRI_GEN_DIR) $(JDK_GEN_DIR)
+!ifdef REGENERATE
+GARBAGE = $(GARBAGE) $(JNI_GEN_DIR) 
+!endif
 !endif
 
 
diff --git a/mozilla/lib/makefile.win b/mozilla/lib/makefile.win
index 0f3fbbfc259..53a36f7241e 100755
--- a/mozilla/lib/makefile.win
+++ b/mozilla/lib/makefile.win
@@ -42,14 +42,9 @@ include <$(DEPTH)\config\config.mak>
 #DIRS=libi18n layout libstyle liblayer libmocha
 DIRS=   libi18n htmldlgs libparse layout libstyle
 
-!ifdef MOZ_OJI
-DIRS=   $(DIRS) plugin
-!endif
-DIRS= $(DIRS) \
 !ifdef MOZ_MAIL_NEWS
-	libaddr \
+DIRS= $(DIRS) libaddr 
 !endif
-	libparse
 
 #//------------------------------------------------------------------------
 #//