diff --git a/mozilla/java/dist/build.xml b/mozilla/java/dist/build.xml
index a9055cc47a3..91047d6d579 100644
--- a/mozilla/java/dist/build.xml
+++ b/mozilla/java/dist/build.xml
@@ -62,6 +62,7 @@
     <antcall target="build.dist.jar" />
     <antcall target="copy.binaries" />
     <antcall target="copy.test.src" />
+    <antcall target="copy.core.src" />
     <antcall target="copy.build.support" />
     <antcall target="build.javadocs" />
     <antcall target="build.zip" />
@@ -95,6 +96,7 @@
     <mkdir dir="${dist.home}/bin" />
     <mkdir dir="${dist.home}/javadocs" />
     <mkdir dir="${dist.home}/test" />
+    <mkdir dir="${dist.home}/src" />
 
     <condition property="so.prefix" value="">
       <and>
@@ -218,6 +220,34 @@
 
   </target>
 
+  <target name="copy.core.src" depends="prepare">
+
+    <!-- Populate the netbeans Source Package with the core 
+         webclient sources -->
+
+    <copy todir="${dist.home}/src/main/java" includeEmptyDirs="false">
+      <fileset dir="${source.home}/webclient/classes_spec">
+        <exclude name="**/*Bookmark*.java" />
+        <exclude name="**/*Preferences*.java" />
+        <exclude name="**/*Profile*.java" />
+        <exclude name="**/test/*" />
+        <exclude name="**/test_nonnative/*" />
+        <exclude name="**/wrapper_nonnative/*" />
+        <exclude name="**/*.html" />
+        <exclude name="**/*ICE*.*" />
+      </fileset>
+      <fileset dir="${source.home}/util/classes">
+        <exclude name="**/*.html" />
+      </fileset>
+      <fileset dir="${source.home}/dom/classes">
+        <exclude name="**/*.html" />
+      </fileset>
+
+    </copy>
+
+  </target>
+
+
   <target name="copy.build.support" depends="prepare">
     <copy todir="${dist.home}/netbeans">
       <fileset dir="${basedir}/netbeans" />
diff --git a/mozilla/java/dist/netbeans/build.xml b/mozilla/java/dist/netbeans/build.xml
index e26fc1ae8df..1616c981780 100755
--- a/mozilla/java/dist/netbeans/build.xml
+++ b/mozilla/java/dist/netbeans/build.xml
@@ -327,6 +327,13 @@ ${so.prefix}xul.${so.extension}.
             </sequential>
         </macrodef>
     </target>
+
+    <target name="compile.core.src" description="Builds the core webclient java sources.  These sources are shipped precompiled in lib/webclient.jar.  This target is included for convenience only, should you wish to modify and re-compile the webclient core library.">
+      <antcall target="compile">
+        <param name="src.dir" value="${basedir}/../src/main/java" />
+      </antcall>
+
+    </target>
     
     
     
diff --git a/mozilla/java/dist/netbeans/nbproject/build-impl.xml b/mozilla/java/dist/netbeans/nbproject/build-impl.xml
index 96472d88573..b91f4c7bf3b 100755
--- a/mozilla/java/dist/netbeans/nbproject/build-impl.xml
+++ b/mozilla/java/dist/netbeans/nbproject/build-impl.xml
@@ -68,6 +68,7 @@ is divided into following sections:
         <condition property="have.sources">
             <or>
                 <available file="${src.dir}"/>
+                <available file="${src.java.dir}"/>
             </or>
         </condition>
         <condition property="netbeans.home+have.tests">
@@ -96,6 +97,7 @@ is divided into following sections:
     </target>
     <target name="-init-check" depends="-pre-init,-init-private,-init-user,-init-project,-do-init">
         <fail unless="src.dir">Must set src.dir</fail>
+        <fail unless="src.java.dir">Must set src.java.dir</fail>
         <fail unless="test.src.dir">Must set test.src.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
         <fail unless="dist.dir">Must set dist.dir</fail>
@@ -117,7 +119,7 @@ is divided into following sections:
     </target>
     <target name="-init-macrodef-javac">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute name="srcdir" default="${src.dir}"/>
+            <attribute name="srcdir" default="${src.dir}:${src.java.dir}"/>
             <attribute name="destdir" default="${build.classes.dir}"/>
             <attribute name="classpath" default="${javac.classpath}"/>
             <attribute name="debug" default="${javac.debug}"/>
@@ -245,6 +247,7 @@ is divided into following sections:
         <j2seproject3:javac/>
         <copy todir="${build.classes.dir}">
             <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
+            <fileset dir="${src.java.dir}" excludes="${build.classes.excludes}"/>
         </copy>
     </target>
     <target name="-post-compile">
@@ -395,9 +398,12 @@ is divided into following sections:
             </classpath>
             <sourcepath>
                 <pathelement location="${src.dir}"/>
+                <pathelement location="${src.java.dir}"/>
             </sourcepath>
             <packageset dir="${src.dir}" includes="*/**"/>
+            <packageset dir="${src.java.dir}" includes="*/**"/>
             <fileset dir="${src.dir}" includes="*.java"/>
+            <fileset dir="${src.java.dir}" includes="*.java"/>
         </javadoc>
     </target>
     <target name="-javadoc-browse" if="netbeans.home" unless="no.javadoc.preview" depends="init,-javadoc-build">
diff --git a/mozilla/java/dist/netbeans/nbproject/genfiles.properties b/mozilla/java/dist/netbeans/nbproject/genfiles.properties
index 4d4f8e65776..4357abfa986 100755
--- a/mozilla/java/dist/netbeans/nbproject/genfiles.properties
+++ b/mozilla/java/dist/netbeans/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=016aa689
 build.xml.stylesheet.CRC32=240b97a2
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=1f65ec4d
-nbproject/build-impl.xml.script.CRC32=7281f4c7
+nbproject/build-impl.xml.data.CRC32=f3c35295
+nbproject/build-impl.xml.script.CRC32=3b42a5af
 nbproject/build-impl.xml.stylesheet.CRC32=20b9345e
diff --git a/mozilla/java/dist/netbeans/nbproject/project.properties b/mozilla/java/dist/netbeans/nbproject/project.properties
index 03edc2cc67c..c5a3d2753ac 100755
--- a/mozilla/java/dist/netbeans/nbproject/project.properties
+++ b/mozilla/java/dist/netbeans/nbproject/project.properties
@@ -18,6 +18,7 @@ dist.jar=${dist.dir}/webclient.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 file.reference.main-java=../test/manual/src/main/java
 file.reference.main-java-1=../test/automated/src/main/java
+file.reference.main-java-2=../src/main/java
 file.reference.webclient-2_0_a5.jar=../lib/webclient-2_0_a5.jar
 jar.compress=false
 javac.classpath=\
@@ -57,4 +58,5 @@ run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
 src.dir=${file.reference.main-java}
+src.java.dir=${file.reference.main-java-2}
 test.src.dir=${file.reference.main-java-1}
diff --git a/mozilla/java/dist/netbeans/nbproject/project.xml b/mozilla/java/dist/netbeans/nbproject/project.xml
index 0d31b3d9c21..196eb3f5b4d 100755
--- a/mozilla/java/dist/netbeans/nbproject/project.xml
+++ b/mozilla/java/dist/netbeans/nbproject/project.xml
@@ -6,7 +6,8 @@
             <name>webclient</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <source-roots>
-                <root id="src.dir"/>
+                <root id="src.dir" name="Example Sources"/>
+                <root id="src.java.dir" name="Core Sources"/>
             </source-roots>
             <test-roots>
                 <root id="test.src.dir"/>