diff --git a/mozilla/java/build.properties.sample b/mozilla/java/build.properties.sample
index 17fb3fb8ad7..d807a1cb28e 100644
--- a/mozilla/java/build.properties.sample
+++ b/mozilla/java/build.properties.sample
@@ -1,6 +1,6 @@
-build.win32.classes=true
+build.mac.classes=true
 
-objdir=C:\\Projects\\mozilla\\MOZILLA_NIH\\XULRUNNER_1_8_0_4\\mozilla\\win32_d.obj
+objdir=/Users/edburns/Projects/mozilla/FIREFOX_1_5_0_9_CVS/mozilla/xulrunner-macosx-ppc_d.obj
 build.home=${objdir}/dist/classes
 
 compile.debug=true
@@ -9,7 +9,7 @@ compile.debug=true
 
 #debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=y
 
-nbide.home=C:\\PROGRA~1\\netbeans-5.5
+nbide.home=/Users/edburns/Applications/NetBeans.app/Contents/Resources/NetBeans
 junit.jar=${nbide.home}/ide7/modules/ext/junit-3.8.1.jar
 
 moz.install.dir=
diff --git a/mozilla/java/dist/build.xml b/mozilla/java/dist/build.xml
index dee133df08b..7e00380a40a 100644
--- a/mozilla/java/dist/build.xml
+++ b/mozilla/java/dist/build.xml
@@ -78,6 +78,13 @@
       </and>
     </condition>
 
+    <condition property="platform" value="macosx-ppc">
+      <and>
+        <os name="Mac OS X" />
+      </and>
+    </condition>
+
+
     <condition property="platform" value="linux">
       <and>
         <os family="unix" />
@@ -101,6 +108,8 @@
     <mkdir dir="${dist.home}/test" />
     <mkdir dir="${dist.home}/src" />
 
+<!-- the shared object library prefix -->
+
     <condition property="so.prefix" value="">
       <and>
         <os family="windows" />
@@ -113,6 +122,34 @@
       </and>
     </condition>
 
+<!-- the jni shared object library extension -->
+
+    <condition property="jni.extension" value="jnilib">
+      <and>
+        <os name="Mac OS X" />
+      </and>
+    </condition>
+
+    <condition property="jni.extension" value="dll">
+      <and>
+        <os family="windows" />
+      </and>
+    </condition>
+
+    <condition property="jni.extension" value="so">
+      <and>
+        <os family="unix" />
+      </and>
+    </condition>
+
+<!-- the shared object library extension -->
+
+    <condition property="so.extension" value="dylib">
+      <and>
+        <os name="Mac OS X" />
+      </and>
+    </condition>
+
     <condition property="so.extension" value="dll">
       <and>
         <os family="windows" />
@@ -137,6 +174,13 @@
       </and>
     </condition>
 
+    <condition property="platform" value="darwin-ppc">
+      <and>
+        <os name="Mac OS X" />
+      </and>
+    </condition>
+
+
     <condition property="has.mozdocdir">
       <available file="${mozdocdir}" />
     </condition>
@@ -201,7 +245,7 @@
     <copy todir="${dist.home}/bin/components" 
           file="${objdir}/java/dom/src/${so.prefix}javadom.${so.extension}" />
     <copy todir="${dist.home}/bin" 
-         file="${objdir}/java/dom/jni/${so.prefix}javadomjni.${so.extension}" />
+         file="${objdir}/java/dom/jni/${so.prefix}javadomjni.${jni.extension}" />
     <copy todir="${dist.home}/bin" 
           file="${objdir}/java/webclient/src_moz/${so.prefix}${name}.${so.extension}" />
 
diff --git a/mozilla/java/dist/netbeans/build.xml b/mozilla/java/dist/netbeans/build.xml
index ad5e9be84b3..faf0c5de824 100755
--- a/mozilla/java/dist/netbeans/build.xml
+++ b/mozilla/java/dist/netbeans/build.xml
@@ -87,6 +87,12 @@
                 <os family="windows" />
             </and>
         </condition>
+        
+        <condition property="so.extension" value="dylib">
+            <and>
+                <os name="Mac OS X" />
+            </and>
+        </condition>
 
         <condition property="so.extension" value="so">
             <and>
@@ -160,9 +166,10 @@
         <property file="webclient.properties" />
         
         <condition property="preconditions.met">
-            <and>
+            <or>
                 <available file="${browser.bin.dir}/${so.prefix}xul.${so.extension}" />
-            </and>
+                <available file="${browser.bin.dir}/${so.prefix}xpcom.${so.extension}" />
+            </or>
         </condition>
         
         <uptodate property="do.copy.binaries">
@@ -213,7 +220,7 @@ ${so.prefix}xul.${so.extension}.
                   value="${basedir}/../2_0_alpha_8.html" />
         
         <java classname="org.mozilla.webclient.test.TestBrowser" fork="true">
-            <jvmarg value="-DNSPR_LOG_MODULES=webclient:4,webclientstub:4,pluglets:4"/>
+            <jvmarg value="-DNSPR_LOG_MODULES=javadom:4,webclient:4,webclientstub:4,pluglets:4"/>
             <jvmarg value="-DNSPR_LOG_FILE=${basedir}${FILE_PATH_SEP}${build.dir}${FILE_PATH_SEP}webclient.log"/>
             <jvmarg value="-Dbuild.test.results.dir=${basedir}${FILE_PATH_SEP}${build.test.results.dir}" />
             <jvmarg value="-DBROWSER_BIN_DIR=${browser.bin.dir}"/>
diff --git a/mozilla/java/dist/netbeans/webclient.properties b/mozilla/java/dist/netbeans/webclient.properties
index 1e26eb8a6ad..650ccce9bf7 100755
--- a/mozilla/java/dist/netbeans/webclient.properties
+++ b/mozilla/java/dist/netbeans/webclient.properties
@@ -1,5 +1,9 @@
 bin.artifacts.pattern=${so.prefix}webclient.${so.extension},${so.prefix}javadomjni.${so.extension},components/${so.prefix}javadom.${so.extension}
+# Unix and Mac OS X
+#debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
+# Windows
 #debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=y
 
 #Make this point to the bin directory of your XULRUNNER installation
+#browser.bin.dir=/Users/edburns/Projects/mozilla/FIREFOX_1_5_0_9_CVS/mozilla/xulrunner-macosx-ppc_d.obj/dist/XUL.framework/Versions/1.8.0.9
 #browser.bin.dir=F:\\Projects\\mozilla\\MOZILLA_NIH\\FIREFOX_1_5_0_9_CVS\\mozilla\\xulrunner-win32_o.obj\\dist\\bin
diff --git a/mozilla/java/dom/build.xml b/mozilla/java/dom/build.xml
index 1b5248e87e1..a223438c041 100644
--- a/mozilla/java/dom/build.xml
+++ b/mozilla/java/dom/build.xml
@@ -107,6 +107,8 @@
                      executable="make"/>
     <exec os="Windows 2000" dir="${objdir.native.path}/jni" executable="make" 
                      failonerror="yes"/>
+    <exec os="Mac OS X" dir="${objdir.native.path}/src" failonerror="yes" 
+                     executable="make"/>
 
   </target>
 
@@ -169,6 +171,11 @@
       <arg line="clobber_all"/>
     </exec>
 
+    <exec os="Mac OS X" dir="${objdir.native.path}/src" failonerror="yes" 
+                     executable="make">
+      <arg line="clobber_all"/>
+    </exec>
+
     <delete>
       <fileset dir="" includes="**/*.ilk"/>
     </delete>
diff --git a/mozilla/java/dom/jni/Makefile.in b/mozilla/java/dom/jni/Makefile.in
index 500f4ad0b99..66433d96097 100644
--- a/mozilla/java/dom/jni/Makefile.in
+++ b/mozilla/java/dom/jni/Makefile.in
@@ -80,8 +80,8 @@ include $(topsrcdir)/config/config.mk
 DEFINES += -DMOZILLA_INTERNAL_API -DFORCE_PR_LOG
 
 ifeq ($(OS_ARCH),Darwin)
- INCLUDES += -I$(MOZ_JDKHOME)/include
- DSO_LDOPTS += -L/System/Library/Frameworks/JavaVM.Framework/Libraries -ljvm_compat
+ INCLUDES := -I$(MOZ_JDKHOME)/include $(INCLUDES)
+ DSO_LDOPTS += -framework JavaVM -flat_namespace -undefined suppress -L/System/Library/Frameworks/JavaVM.Framework/Libraries -ljvm_compat
  DLL_SUFFIX = .jnilib
 else
 ifeq ($(OS_ARCH),Linux)
diff --git a/mozilla/java/dom/src/Makefile.in b/mozilla/java/dom/src/Makefile.in
index 77a82b7611d..c9b8b634440 100644
--- a/mozilla/java/dom/src/Makefile.in
+++ b/mozilla/java/dom/src/Makefile.in
@@ -61,9 +61,9 @@ EXTRA_LIBS		+= \
 include $(topsrcdir)/config/config.mk
 
 ifeq ($(OS_ARCH),Darwin)
- INCLUDES += -I$(MOZ_JDKHOME)/include -I.
- DSO_LDOPTS += -L/System/Library/Frameworks/JavaVM.Framework/Libraries -ljvm_compat
- DLL_SUFFIX = .jnilib
+ INCLUDES := -I$(MOZ_JDKHOME)/include -I. $(INCLUDES)
+ DSO_LDOPTS += -framework JavaVM -flat_namespace -undefined suppress -L/System/Library/Frameworks/JavaVM.Framework/Libraries -ljvm_compat
+ DLL_SUFFIX = .dylib
 endif #DARWIN
 
 ifeq ($(OS_ARCH),Linux)
diff --git a/mozilla/java/webclient/build.xml b/mozilla/java/webclient/build.xml
index 30d1f61c0bc..c9366db64c3 100644
--- a/mozilla/java/webclient/build.xml
+++ b/mozilla/java/webclient/build.xml
@@ -150,6 +150,9 @@
                      executable="make"/>
     <exec os="Windows 2000" dir="${objdir.native.path}/src_share" executable="make" 
                      failonerror="yes"/>
+    <exec os="Mac OS X" dir="${objdir.native.path}/src_share" executable="make" 
+                     failonerror="yes">
+    </exec>
 
   </target>
 
@@ -362,6 +365,12 @@ ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.Embedd
       <arg line="clobber_all"/>
     </exec>
 
+    <exec os="Mac OS X" dir="${objdir.native.path}/src_share" executable="make" 
+                     failonerror="yes">
+      <arg line="clobber_all"/>
+    </exec>
+
+
   </target>
 
   <target name="test" depends="main" 
diff --git a/mozilla/java/webclient/src_moz/EmbedWindow.cpp b/mozilla/java/webclient/src_moz/EmbedWindow.cpp
index 1919f260f12..97f462a73de 100644
--- a/mozilla/java/webclient/src_moz/EmbedWindow.cpp
+++ b/mozilla/java/webclient/src_moz/EmbedWindow.cpp
@@ -790,7 +790,7 @@ NS_IMETHODIMP EmbedWindow::OnCopyOrDrag(nsIDOMEvent *aEvent,
         nsXPIDLCString flavorStr;
         if ( currentFlavor ) {
             currentFlavor->ToString(getter_Copies(flavorStr));
-            UINT format = GetFormat(flavorStr);
+            PRUint32 format = GetFormat(flavorStr);
 
             // Do various things internal to the implementation, like
             // map one flavor to another or add additional flavors based
@@ -854,8 +854,9 @@ NS_IMETHODIMP EmbedWindow::OnPasteOrDrop(nsIDOMEvent *event, nsITransferable *tr
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-UINT EmbedWindow::GetFormat(const char* aMimeStr)
+PRUint32 EmbedWindow::GetFormat(const char* aMimeStr)
 {
+#ifdef _WIN32
   UINT format;
 
   if (strcmp(aMimeStr, kTextMime) == 0)
@@ -879,6 +880,8 @@ UINT EmbedWindow::GetFormat(const char* aMimeStr)
     format = ::RegisterClipboardFormat(aMimeStr);
 
   return format;
+#endif
+  return (PRUint32) 0;
 }
 
 NS_IMETHODIMP
diff --git a/mozilla/java/webclient/src_moz/EmbedWindow.h b/mozilla/java/webclient/src_moz/EmbedWindow.h
index 797ae218fc8..bcd180cfb88 100644
--- a/mozilla/java/webclient/src_moz/EmbedWindow.h
+++ b/mozilla/java/webclient/src_moz/EmbedWindow.h
@@ -112,7 +112,7 @@ public:
     
 private:
 
-    UINT                     GetFormat(const char* aMimeStr);
+    PRUint32                 GetFormat(const char* aMimeStr);
     NS_IMETHOD               GetText(JNIEnv * env, nsITransferable *aTransferable, 
                                      const nsACString & aDataFlavor, jstring *result);
     NS_IMETHOD               SendTextToJava(JNIEnv *env, 
diff --git a/mozilla/java/webclient/src_moz/Makefile.in b/mozilla/java/webclient/src_moz/Makefile.in
index 5b7adb6af42..7814e7d836e 100644
--- a/mozilla/java/webclient/src_moz/Makefile.in
+++ b/mozilla/java/webclient/src_moz/Makefile.in
@@ -142,7 +142,7 @@ else
 ifeq ($(OS_ARCH),Darwin)
 CMMSRCS = cocoa/CocoaBrowserControlCanvas.mm
 CPPSRCS += cocoa/CocoaBrowserControlCanvasImpl.cpp
-DLL_SUFFIX = .jnilib
+DLL_SUFFIX = .dylib
 #DSO_LDOPTS += -L/System/Library/Frameworks/JavaVM.Framework/Libraries -ljawt
 DSO_LDOPTS += -framework JavaVM -framework AppKit -lobjc -L$(srcdir)/../src_share
 else
@@ -215,7 +215,7 @@ INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/win32 $(INCLUDES)
        -I$(srcdir)/../src_share -I../src_share -I. -I./win32
 else
 ifeq ($(OS_ARCH),Darwin)
-INCLUDES := -I$(MOZ_JDKHOME)/include $(INCLUDES) -I$(srcdir)/../src_share -I../src_share -I.
+INCLUDES := -I$(MOZ_JDKHOME)/include $(INCLUDES) -I$(srcdir)/../src_share -I../src_share -I. -I$(srcdir) -I$(srcdir)/cocoa -I./cocoa
 else
 INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/solaris $(INCLUDES) \
 	-I$(DEPTH)/widget/src/gtk -I$(srcdir)/../src_share -I../src_share