diff --git a/solr/build.xml b/solr/build.xml
index 60023888637..b55903e6334 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -177,11 +177,6 @@
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
-  <target name="javadocs-solr-core">
-    <ant dir="core" target="javadocs" inheritAll="false">
-      <propertyset refid="uptodate.and.compiled.properties"/>
-    </ant>
-  </target>
   
   <!-- Solrj targets -->
   <target name="test-solrj" description="Test java client">
@@ -189,11 +184,6 @@
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
-  <target name="javadocs-solrj">
-    <ant dir="solrj" target="javadocs" inheritAll="false">
-      <propertyset refid="uptodate.and.compiled.properties"/>
-    </ant>
-  </target>
 
   <!-- Solr contrib targets -->
   <target name="test-contrib" description="Run contrib unit tests.">
diff --git a/solr/common-build.xml b/solr/common-build.xml
index 8d1bae55c03..92ceceeba3a 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -200,21 +200,52 @@
   <target name="lucene-javadocs" depends="javadocs-lucene-core,javadocs-analyzers-common,javadocs-analyzers-icu,javadocs-analyzers-kuromoji,javadocs-analyzers-phonetic,javadocs-analyzers-smartcn,javadocs-analyzers-morfologik,javadocs-analyzers-stempel,javadocs-analyzers-uima,javadocs-suggest,javadocs-grouping,javadocs-queries,javadocs-queryparser,javadocs-highlighter,javadocs-memory,javadocs-misc,javadocs-spatial,javadocs-test-framework"/>
 
   <!-- create javadocs for the current module -->
-  <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs">
+  <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs,javadocs-solr-core">
    	<sequential>
       <mkdir dir="${javadoc.dir}/${name}"/>
       <solr-invoke-javadoc>
         <solrsources>
           <packageset dir="${src.dir}"/>
         </solrsources>
+        <links>
+          <link href="../solr-solrj"/>
+          <link href="../solr-core"/>
+        </links>
       </solr-invoke-javadoc>
       <solr-jarify basedir="${javadoc.dir}/${name}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
      </sequential>
   </target>
 
+  <target name="check-solr-core-javadocs-uptodate" unless="solr-core-javadocs.uptodate">
+    <uptodate property="solr-core-javadocs.uptodate" targetfile="${build.dir}/solr-core/apache-solr-core-${version}-javadoc.jar">
+       <srcfiles dir="${common-solr.dir}/core/src/java" includes="**/*.java"/>
+    </uptodate>
+  </target>
+
+  <target name="check-solrj-javadocs-uptodate" unless="solrj-javadocs.uptodate">
+    <uptodate property="solrj-javadocs.uptodate" targetfile="${build.dir}/solr-solrj/apache-solr-solrj-${version}-javadoc.jar">
+       <srcfiles dir="${common-solr.dir}/solrj/src/java" includes="**/*.java"/>
+    </uptodate>
+  </target>
+
+  <target name="javadocs-solr-core" depends="check-solr-core-javadocs-uptodate" unless="solr-core-javadocs.uptodate">
+    <ant dir="${common-solr.dir}/core" target="javadocs" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
+    <property name="solr-core-javadocs.uptodate" value="true"/>
+  </target>
+
+  <target name="javadocs-solrj" depends="check-solrj-javadocs-uptodate" unless="solrj-javadocs.uptodate">
+    <ant dir="${common-solr.dir}/solrj" target="javadocs" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
+    <property name="solrj-javadocs.uptodate" value="true"/>
+  </target>
+
   <!-- macro to create solr javadocs with links to lucene. make sure calling task depends on lucene-javadocs -->
   <macrodef name="solr-invoke-javadoc">
       <element name="solrsources" optional="yes"/>
+      <element name="links" optional="yes"/>
       <attribute name="destdir" default="${javadoc.dir}/${name}"/>
       <attribute name="title" default="${Name} ${version} ${name} API"/>
       <attribute name="overview" default="${src.dir}/overview.html"/>
@@ -240,6 +271,7 @@
           <link offline="true" href="${lucene.javadoc.url}memory" packagelistloc="${lucenedocs}/memory"/>
           <link offline="true" href="${lucene.javadoc.url}misc" packagelistloc="${lucenedocs}/misc"/>
           <link offline="true" href="${lucene.javadoc.url}spatial" packagelistloc="${lucenedocs}/spatial"/>
+          <links/>
           <link href=""/>
         </sources>
       </invoke-javadoc>
diff --git a/solr/core/build.xml b/solr/core/build.xml
index 3137cf3bdf0..bff9ead936b 100644
--- a/solr/core/build.xml
+++ b/solr/core/build.xml
@@ -25,5 +25,21 @@
 
   <target name="compile-core" depends="compile-solrj,common-solr.compile-core"/>
 
+  <!-- specialized to ONLY depend on solrj -->
+  <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs,javadocs-solrj">
+    <sequential>
+      <mkdir dir="${javadoc.dir}/${name}"/>
+      <solr-invoke-javadoc>
+        <solrsources>
+          <packageset dir="${src.dir}"/>
+        </solrsources>
+        <links>
+          <link href="../solr-solrj"/>
+        </links>
+      </solr-invoke-javadoc>
+      <solr-jarify basedir="${javadoc.dir}/${name}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
+     </sequential>
+  </target>
+
   <target name="dist-maven" depends="dist-maven-src-java"/>
 </project>
diff --git a/solr/solrj/build.xml b/solr/solrj/build.xml
index 9952c747394..c9228233417 100644
--- a/solr/solrj/build.xml
+++ b/solr/solrj/build.xml
@@ -33,6 +33,19 @@
         <path refid="solr.base.classpath"/>
   </path>
 
+  <!-- Specialized to depend on nothing -->
+  <target name="javadocs" depends="compile-core">
+    <sequential>
+      <mkdir dir="${javadoc.dir}/${name}"/>
+      <solr-invoke-javadoc>
+        <solrsources>
+          <packageset dir="${src.dir}"/>
+        </solrsources>
+      </solr-invoke-javadoc>
+      <solr-jarify basedir="${javadoc.dir}/${name}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
+     </sequential>
+  </target>
+
   <target name="dist" depends="common-solr.dist">
     <mkdir  dir="${dist}/solrj-lib" />
     <copy todir="${dist}/solrj-lib">