diff --git a/build.xml b/build.xml
index 2582cba..19a4a2c 100644
--- a/build.xml
+++ b/build.xml
@@ -101,63 +101,40 @@
     </java>
   </target>
   
-  <target name="javadoc"
-      description="Generate Javadocs.">
-    <mkdir dir="${build.dir}/javadoc"/>
-    <javadoc packagenames="${javadoc.packagenames}"
-         destdir="${build.dir}/javadoc"
-         author="false"
-         protected="true"
-         windowtitle="Guice ${version} API">
-      <sourcepath>
-        <pathelement location="${src.dir}"/>
-        <pathelement location="${servlet.src.dir}"/>
-        <pathelement location="${spring.src.dir}"/>
-        <pathelement location="${assistedinject.src.dir}"/>
-        <pathelement location="${jmx.src.dir}"/>
-        <pathelement location="${jndi.src.dir}"/>
-        <pathelement location="${throwingproviders.src.dir}"/>
-        <pathelement location="${multibindings.src.dir}"/>
-        <pathelement location="${lifecycle.src.dir}"/>
-        <pathelement location="${persist.src.dir}"/>
-      </sourcepath>
-      <classpath refid="compile.classpath"/>
-      <classpath>
-        <fileset dir="extensions/servlet/lib/build" includes="*.jar"/>
-      </classpath>
-      <link href="http://aopalliance.sourceforge.net/doc"/>
-      <link href="http://java.sun.com/javase/6/docs/api"/>
-      <link href="http://www.springframework.org/docs/api/"/>
+  <target name="javadoc">
+    <javadoc packagenames="com.google.*"
+             destdir="build/docs"
+             docletpath="lib/build/doclava.jar"
+             bootclasspath="${javahome}/jre/lib/rt.jar"
+             maxmemory="512M">
+      <fileset dir="src" defaultexcludes="yes">
+        <include name="com/google/**"/>
+        <exclude name="com/google/inject/internal/**"/>
+      </fileset>
+      <fileset dir="${servlet.src.dir}"/>
+      <fileset dir="${spring.src.dir}"/>
+      <fileset dir="${assistedinject.src.dir}"/>
+      <fileset dir="${jmx.src.dir}"/>
+      <fileset dir="${jndi.src.dir}"/>
+      <fileset dir="${throwingproviders.src.dir}"/>
+      <fileset dir="${multibindings.src.dir}"/>
+      <fileset dir="${persist.src.dir}"/>
+
+      <doclet name="com.google.doclava.Doclava">
+        <param name="-hdf"/> <param name="project.name"/> <param name="Guice"/>
+        <param name="-since"/> <param name="/Users/jessewilson/Projects/guice-revs/versions/guice-1.0.xml"/> <param name="Guice_1.0" />
+        <param name="-since"/> <param name="/Users/jessewilson/Projects/guice-revs/versions/guice-2.0.xml"/> <param name="Guice_2.0" />
+        <param name="-apiversion" value="Guice_3.0"/>
+        <param name="-assetsdir" value="javadoc/assets"/>
+        <!-- TODO: fix doclava federation
+          http://aopalliance.sourceforge.net/doc
+          http://www.springframework.org/docs/api/
+          <param name="-federate"/><param name="JDK"/><param name="http://download.oracle.com/javase/6/docs/api/index.html?"/>
+          <param name="-federationxml"/><param name="JDK"/><param name="http://doclava.googlecode.com/svn/static/api/openjdk-6.xml"/>
+        -->
+      </doclet>
     </javadoc>
-    <!-- generate core javadocs, used only for its left-side nav -->
-    <mkdir dir="${build.dir}/javadoc-core"/>
-    <javadoc packagenames="${javadoc.packagenames}"
-         destdir="${build.dir}/javadoc-core"
-         author="false"
-         protected="true"
-         windowtitle="Guice ${version} Core API"
-         sourcepath="${src.dir}">
-      <classpath refid="compile.classpath"/>
-      <link href="http://aopalliance.sourceforge.net/doc"/>
-      <link href="http://java.sun.com/javase/6/docs/api"/>
-    </javadoc>
-    <!-- setup the left-side navigation frames to toggle between core and all classes -->
-    <move file="${build.dir}/javadoc/overview-frame.html" tofile="${build.dir}/javadoc/overview-frame-with-extensions.html"/>
-    <copy file="${build.dir}/javadoc-core/overview-frame.html" tofile="${build.dir}/javadoc/overview-frame.html"/>
-    <replace file="${build.dir}/javadoc/overview-frame.html" token="&lt;A HREF=&quot;allclasses-frame.html&quot; target=&quot;packageFrame&quot;&gt;All Classes&lt;/A&gt;&lt;/FONT&gt;"
-             value="&lt;A HREF=&quot;allclasses-frame.html&quot; target=&quot;packageFrame&quot;&gt;&lt;b&gt;Core&lt;/b&gt;&lt;/A&gt;
-             &amp;nbsp;
-             &lt;a href='overview-frame-with-extensions.html'&gt;Show Extensions&lt;/a&gt;
-             &lt;/FONT&gt;"/>
-    <replace file="${build.dir}/javadoc/overview-frame-with-extensions.html" token="&lt;A HREF=&quot;allclasses-frame.html&quot; target=&quot;packageFrame&quot;&gt;All Classes&lt;/A&gt;&lt;/FONT&gt;"
-             value="&lt;A HREF=&quot;allclasses-frame-with-extensions.html&quot; target=&quot;packageFrame&quot;&gt;&lt;b&gt;All&lt;/b&gt;&lt;/A&gt;
-             &amp;nbsp;
-             &lt;a href='overview-frame.html'&gt;Hide Extensions&lt;/a&gt;
-             &lt;/FONT&gt;"/>
-    <move file="${build.dir}/javadoc/allclasses-frame.html" tofile="${build.dir}/javadoc/allclasses-frame-with-extensions.html"/>
-    <copy file="${build.dir}/javadoc-core/allclasses-frame.html" tofile="${build.dir}/javadoc/allclasses-frame.html"/>
-    <replace file="${build.dir}/javadoc/allclasses-frame.html" token="All Classes" value="Core Classes"/>
-    <move file="${build.dir}/javadoc-core/overview-summary.html" tofile="${build.dir}/javadoc/overview-summary.html"/>
+    <move todir="build/docs/javadoc"><fileset dir="build/docs/reference"/></move>
   </target>
 
   <target name="no_aop"