diff --git a/mozilla/java/build.properties.sample b/mozilla/java/build.properties.sample
new file mode 100644
index 00000000000..fa2441ffb1f
--- /dev/null
+++ b/mozilla/java/build.properties.sample
@@ -0,0 +1 @@
+build.unix.classes=true
diff --git a/mozilla/java/webclient/build.xml b/mozilla/java/webclient/build.xml
new file mode 100644
index 00000000000..12a75edb731
--- /dev/null
+++ b/mozilla/java/webclient/build.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0"?>
+
+<!--
+
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+
+ * Ed Burns &gt;edburns@acm.org&lt;
+
+
+-->
+
+<project name="webclient" default="main" basedir=".">
+
+  <property name="Name" value="webclient"/>
+  <property name="name" value="webclient"/>
+  <property name="version" value="20020916"/>
+
+<!-- ************ Per user local properties ******************************* -->
+
+  <property file="${user.home}/build.properties"/>   <!-- User local        -->
+  <property file="build.properties"/>                <!-- Component local   -->
+  <property file="../build.properties"/>         <!-- java-supplement local -->
+  <property environment="myenv" />
+
+<!-- ************ Compiler Defaults *************************************** -->
+
+  <!-- Should Java compilations set the 'debug' compiler option? -->
+  <property name="compile.debug" value="true"/>
+
+  <!-- Should Java compilations set the 'deprecation' compiler option? -->
+  <property name="compile.deprecation" value="false"/>
+
+  <!-- Should Java compilations set the 'optimize' compiler option? -->
+  <property name="compile.optimize" value="false"/>
+
+<!-- ************ Where are we building into? ***************************** -->
+
+  <!-- The base directory for compilation targets -->
+  <property name="build.home" value="${myenv.MOZILLA_FIVE_HOME}/.."/>
+
+  <!-- The base directory for component sources -->
+  <property name="source.home" value="${basedir}/classes_spec"/>
+
+  <!-- Construct compile classpath -->
+  <path id="compile.classpath">
+    <pathelement location="${build.home}/classes"/>
+  </path>
+
+  <target name="main" 
+          depends="compile.classes_spec,compile.src_share,compile.src_moz"/>
+
+  <target name="compile.classes_spec">
+
+    <javac destdir="${build.home}/classes"
+             debug="${compile.debug}"
+       deprecation="${compile.deprecation}"
+          optimize="${compile.optimize}">
+      <classpath refid="compile.classpath"/>
+      <src path="${source.home}"/>
+      <patternset>
+            <include name="org/mozilla/webclient/wrapper_native/gtk/*" 
+                     if="build.unix.classes"/>
+      </patternset>
+      <patternset>
+            <include name="org/mozilla/webclient/wrapper_native/win32/*" 
+                     if="build.win32.classes"/>
+      </patternset>
+
+      <!-- PENDING(edburns): include additional patternsets for ICE,
+           HotJava, etc -->
+
+      <include name="org/mozilla/webclient/*"/>
+      <include name="org/mozilla/webclient/wrapper_native/*"/>
+      <include name="org/mozilla/webclient/test/*"/>
+    </javac>
+
+  </target>
+
+  <target name="compile.src_share" depends="compile.javah.headers">
+
+    <exec os="Linux" dir="${basedir}/src_share" executable="make"/>
+
+  </target>
+
+  <target name="compile.javah.headers" depends="compile.javah.canvas.headers">
+
+    <javah outputFile="${basedir}/src_share/BookmarksImpl.h"
+           class="org.mozilla.webclient.wrapper_native.BookmarksImpl">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/PreferencesImpl.h"
+           class="org.mozilla.webclient.wrapper_native.PreferencesImpl">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/CurrentPageImpl.h"
+           class="org.mozilla.webclient.wrapper_native.CurrentPageImpl">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/HistoryImpl.h"
+           class="org.mozilla.webclient.wrapper_native.HistoryImpl">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/WrapperFactoryImpl.h"
+           class="org.mozilla.webclient.wrapper_native.WrapperFactoryImpl">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/NavigationImpl.h"
+           class="org.mozilla.webclient.wrapper_native.NavigationImpl">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/RDFEnumeration.h"
+           class="org.mozilla.webclient.wrapper_native.RDFEnumeration">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/RDFTreeNode.h"
+           class="org.mozilla.webclient.wrapper_native.RDFTreeNode">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/ISupportsPeer.h"
+           class="org.mozilla.webclient.wrapper_native.ISupportsPeer">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/WindowControlImpl.h"
+           class="org.mozilla.webclient.wrapper_native.WindowControlImpl">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/NativeEventThread.h"
+           class="org.mozilla.webclient.wrapper_native.NativeEventThread">
+      <classpath refid="compile.classpath"/>
+    </javah>
+  </target>
+
+  <target name="compile.javah.canvas.headers" 
+          depends="compile.unix.canvas.headers,compile.win32.canvas.headers"/>
+
+  <target name="compile.unix.canvas.headers" if="build.unix.classes">
+
+    <javah outputFile="${basedir}/src_moz/gtk/GtkBrowserControlCanvas.h"
+      class="org.mozilla.webclient.wrapper_native.gtk.GtkBrowserControlCanvas">
+      <classpath refid="compile.classpath"/>
+    </javah>
+
+  </target>
+
+  <target name="compile.win32.canvas.headers" if="build.win32.classes">
+
+    <javah outputFile="${basedir}/src_moz/gtk/GtkBrowserControlCanvas.h"
+      class="org.mozilla.webclient.wrapper_native.gtk.GtkBrowserControlCanvas">
+      <classpath refid="compile.classpath"/>
+    </javah>
+
+  </target>
+
+
+
+  <target name="compile.src_moz" depends="compile.src_share">
+
+    <exec os="Linux" dir="${basedir}/src_moz" executable="make"/>
+
+  </target>
+
+
+  <target name="clean">
+
+    <exec os="Linux" dir="${basedir}/src_moz" executable="make">
+
+      <arg line="clobber_all"/>
+
+    </exec>
+
+    <exec os="Linux" dir="${basedir}/src_share" executable="make">
+
+      <arg line="clobber_all"/>
+
+    </exec>
+
+    <delete >
+      <fileset dir="${basedir}/src_share">
+        <include name="*.h"/>
+        <exclude name="bal_util.h"/>
+        <exclude name="jni_util_export.h"/>
+        <exclude name="jni_util.h"/>
+      </fileset>
+    </delete>
+
+    <delete dir="${build.home}/classes/org/mozilla/webclient"/>
+
+  </target>
+
+
+</project>
diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/motif/MotifBrowserControlCanvas.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/gtk/GtkBrowserControlCanvas.java
similarity index 88%
rename from mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/motif/MotifBrowserControlCanvas.java
rename to mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/gtk/GtkBrowserControlCanvas.java
index b791e2a8828..2f372a3afe1 100644
--- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/motif/MotifBrowserControlCanvas.java
+++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/gtk/GtkBrowserControlCanvas.java
@@ -19,9 +19,9 @@
  *
  * Contributor(s): 
  */
-package org.mozilla.webclient.wrapper_native.motif;
+package org.mozilla.webclient.wrapper_native.gtk;
 
-// MotifBrowserControlCanvas.java
+// GtkBrowserControlCanvas.java
 
 import org.mozilla.util.Assert;
 import org.mozilla.util.Log;
@@ -29,14 +29,14 @@ import org.mozilla.util.ParameterCheck;
 
 /**
 
- * MotifBrowserControlCanvas provides a concrete realization
- * of the RaptorCanvas for Motif.
+ * GtkBrowserControlCanvas provides a concrete realization
+ * of the RaptorCanvas for Gtk.
 
  * <B>Lifetime And Scope</B> <P>
 
  * There is one instance of the WebShellCanvas per top level awt Frame.
 
- * @version $Id: MotifBrowserControlCanvas.java,v 1.4 2001-06-01 17:11:30 ashuk%eng.sun.com Exp $
+ * @version $Id: GtkBrowserControlCanvas.java,v 1.1 2002-09-18 18:25:23 edburns%acm.org Exp $
  * 
  * @see	org.mozilla.webclient.BrowserControlCanvasFactory
  * 
@@ -51,14 +51,14 @@ import org.mozilla.webclient.*;
 import org.mozilla.webclient.wrapper_native.*;
 
 /**
- * MotifBrowserControlCanvas provides a concrete realization
+ * GtkBrowserControlCanvas provides a concrete realization
  * of the RaptorCanvas.
  */
-public class MotifBrowserControlCanvas extends BrowserControlCanvas /* implements ActionListener*/  {
+public class GtkBrowserControlCanvas extends BrowserControlCanvas /* implements ActionListener*/  {
 
     static {
         System.loadLibrary("webclientstub");
-        MotifBrowserControlCanvas.loadMainDll();
+        GtkBrowserControlCanvas.loadMainDll();
     }
     
     static private boolean firstTime = true;
@@ -79,7 +79,7 @@ public class MotifBrowserControlCanvas extends BrowserControlCanvas /* implement
     //New method for obtaining access to the Native Peer handle
     private native int getHandleToPeer();
 
-    public MotifBrowserControlCanvas() {
+    public GtkBrowserControlCanvas() {
         super();
         
         this.gtkWinID = 0;
diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/motif/README b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/motif/README
new file mode 100644
index 00000000000..62dcfe9e4a4
--- /dev/null
+++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/motif/README
@@ -0,0 +1 @@
+All classes in this directory have been cvs removed.  See ../gtk.
diff --git a/mozilla/java/webclient/src_moz/Makefile.in b/mozilla/java/webclient/src_moz/Makefile.in
index c2969703208..c5961893d00 100644
--- a/mozilla/java/webclient/src_moz/Makefile.in
+++ b/mozilla/java/webclient/src_moz/Makefile.in
@@ -90,35 +90,6 @@ REQUIRES	= xpcom \
  		  $(NULL)
  
 CPPSRCS = \
-	ns_util.cpp \
-	ns_util_export.cpp \
-	dom_util.cpp \
-	nsActions.cpp \
-	rdf_util.cpp \
-	BookmarksImpl.cpp \
-	CBrowserContainer.cpp \
-	PromptActionEvents.cpp  \
-	CurrentPageImpl.cpp \
-	CurrentPageActionEvents.cpp \
-	HistoryImpl.cpp \
-	HistoryActionEvents.cpp \
-	ISupportsPeer.cpp \
-	NativeEventThread.cpp \
-	NativeEventThreadActionEvents.cpp \
-	NavigationImpl.cpp \
-	NavigationActionEvents.cpp \
-	InputStreamShim.cpp \
-	RDFEnumeration.cpp \
-	RDFTreeNode.cpp \
-	RDFActionEvents.cpp \
-	wsRDFObserver.cpp \
-	WindowControlImpl.cpp \
-	WindowControlActionEvents.cpp \
-	PreferencesImpl.cpp \
-	PreferencesActionEvents.cpp \
-	WrapperFactoryImpl.cpp \
-	motif/MotifBrowserControlCanvas.cpp \
-	motif/gtkmozilla.cpp \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/java/webclient/src_share/Makefile.in b/mozilla/java/webclient/src_share/Makefile.in
index 33b61dcca23..64166a32b92 100644
--- a/mozilla/java/webclient/src_share/Makefile.in
+++ b/mozilla/java/webclient/src_share/Makefile.in
@@ -22,8 +22,6 @@ topsrcdir	= $(DEPTH)
 srcdir		= $(topsrcdir)/java/webclient/src_share
 VPATH		= $(topsrcdir)/java/webclient/src_share
 
-JAVAHOME        = $(JDKHOME)
-
 include $(DEPTH)/config/autoconf.mk
 
 MODULE          = webclient
@@ -61,44 +59,3 @@ endif
 endif
 
 
-JAVAH_CLS= \
-	"-o BookmarksImpl.h org.mozilla.webclient.wrapper_native.BookmarksImpl" \
-	"-o PreferencesImpl.h org.mozilla.webclient.wrapper_native.PreferencesImpl" \
-	"-o CurrentPageImpl.h org.mozilla.webclient.wrapper_native.CurrentPageImpl" \
-	"-o HistoryImpl.h org.mozilla.webclient.wrapper_native.HistoryImpl" \
-	"-o WrapperFactoryImpl.h org.mozilla.webclient.wrapper_native.WrapperFactoryImpl" \
-	"-o NavigationImpl.h org.mozilla.webclient.wrapper_native.NavigationImpl" \
-	"-o RDFEnumeration.h org.mozilla.webclient.wrapper_native.RDFEnumeration" \
-	"-o RDFTreeNode.h org.mozilla.webclient.wrapper_native.RDFTreeNode" \
-	"-o ISupportsPeer.h org.mozilla.webclient.wrapper_native.ISupportsPeer" \
-	"-o WindowControlImpl.h org.mozilla.webclient.wrapper_native.WindowControlImpl" \
-	"-o NativeEventThread.h org.mozilla.webclient.wrapper_native.NativeEventThread" \
-	$(NULL)
-
-JAVAH_FILES=\
-	BookmarksImpl.h \
-	PreferencesImpl.h \
-	CurrentPageImpl.h \
-	HistoryImpl.h \
-	WrapperFactoryImpl.h \
-	NavigationImpl.h \
-	RDFEnumeration.h \
-	RDFTreeNode.h \
-	ISupportsPeer.h \
-	WindowControlImpl.h \
-	NativeEventThread.h \
-	$(NULL)
-
-JAVAH_PROG=$(JDKHOME)/bin/javah
-JAVAH_FLAGS=-jni -classpath $(CLASSPATH):$(JAVA_DESTPATH)
-
-export:: $(JAVAH_FILES)
-
-$(JAVAH_FILES): 
-	@for c in $(JAVAH_CLS); do \
-		echo $(JAVAH_PROG) $(JAVAH_FLAGS) $$c; \
-		$(JAVAH_PROG) $(JAVAH_FLAGS) $$c; \
-	done
-
-clobber_all::
-	rm -f $(JAVAH_FILES)