diff --git a/mozilla/js/rhino/build.xml b/mozilla/js/rhino/build.xml
index 4fc4ef79351..27bc446e707 100644
--- a/mozilla/js/rhino/build.xml
+++ b/mozilla/js/rhino/build.xml
@@ -38,10 +38,15 @@ Requires Ant version 1.2 or later
     <antcall target="xmlimplsrc-compile" />
   </target>
 
+  <target name="compile-all" depends="compile">
+    <ant antfile="deprecatedsrc/build.xml" target="compile"/>
+  </target>
+
   <target name="copy-source" depends="init">
     <ant antfile="src/build.xml" target="copy-source"/>
     <ant antfile="toolsrc/build.xml" target="copy-source"/>
     <antcall target="xmlimplsrc-copy-source" />
+    <ant antfile="deprecatedsrc/build.xml" target="copy-source"/>
     <copy todir="${dist.dir}" file="build.xml"/>
     <copy todir="${dist.dir}" file="build.properties"/>
     <copy todir="${dist.dir}" file="apiClasses.properties"/>
@@ -59,7 +64,7 @@ Requires Ant version 1.2 or later
     <ant antfile="${xmlimplsrc-build-file}" target="copy-source"/>
   </target>
 
-  <target name="jar" depends="compile">
+  <target name="jar" depends="compile-all">
     <jar jarfile="${dist.dir}/${rhino.jar}"
          basedir="${classes}"
          manifest="src/manifest"
@@ -85,12 +90,6 @@ Requires Ant version 1.2 or later
       <exclude name="org/mozilla/javascript/JavaAdapter*.class"/>
       <exclude name="org/mozilla/javascript/InterfaceAdapter*.class"/>
 
-      <!-- exclude deprecated classes -->
-      <exclude name="org/mozilla/javascript/NotAFunctionException.class"/>
-      <exclude name="org/mozilla/javascript/PropertyException.class"/>
-      <exclude name="org/mozilla/javascript/ClassDefinitionException.class"/>
-
-
       <include name="org/mozilla/javascript/regexp/*.class"
                unless="no-regexp"/>
 
@@ -179,8 +178,13 @@ Requires Ant version 1.2 or later
 
  clean       remove all compiled classes and copied property files
 
- compile     compile all classes and copy all property files
+ compile     compile classes and copy all property files
+             into ${classes} directory 
+             excluding deprecated code
+
+ compile-all compile all classes and copy all property files
              into ${classes} directory
+             including deprecated code
 
  deepclean   remove all generated files and directories
 
diff --git a/mozilla/js/rhino/deprecatedsrc/build.xml b/mozilla/js/rhino/deprecatedsrc/build.xml
new file mode 100644
index 00000000000..284ff5bbe6e
--- /dev/null
+++ b/mozilla/js/rhino/deprecatedsrc/build.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<project name="src" default="compile" basedir="..">
+
+  <property file="build.properties"/>
+
+  <target name="compile">
+    <javac srcdir="deprecatedsrc"
+           destdir="${classes}"
+           includes="org/**/*.java"
+           deprecation="on"
+           debug="${debug}"
+	   target="${target-jvm}"
+	   >
+    </javac>
+  </target>
+
+  <target name="copy-source">
+    <mkdir dir="${dist.dir}/src"/>
+    <copy todir="${dist.dir}/src">
+      <fileset dir="deprecatedsrc"
+               includes="**/*.java,**/*.properties,**/*.xml,manifest"/>
+    </copy>
+  </target>
+
+</project>
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/ClassDefinitionException.java b/mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/ClassDefinitionException.java
similarity index 100%
rename from mozilla/js/rhino/src/org/mozilla/javascript/ClassDefinitionException.java
rename to mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/ClassDefinitionException.java
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/NotAFunctionException.java b/mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/NotAFunctionException.java
similarity index 100%
rename from mozilla/js/rhino/src/org/mozilla/javascript/NotAFunctionException.java
rename to mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/NotAFunctionException.java
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/PropertyException.java b/mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/PropertyException.java
similarity index 100%
rename from mozilla/js/rhino/src/org/mozilla/javascript/PropertyException.java
rename to mozilla/js/rhino/deprecatedsrc/org/mozilla/javascript/PropertyException.java