diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c61f84f91d8..f0168d209e5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -357,6 +357,8 @@ Bug Fixes
   module to the o.a.s.util package in the Solr core module. 
   (David Smiley via Steve Rowe)
 
+* SOLR-2766: Package individual javadoc sites for solrj and test-framework.
+  (Steve Rowe, Mike McCandless)
 
 ==================  3.4.0  ==================
 
diff --git a/solr/build.xml b/solr/build.xml
index f377b6a69d1..67fafaac8ec 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -135,7 +135,8 @@
           depends="test-solr-core, test-solrj"/>
   <target name="compile-test" description="Compile unit tests."
           depends="compile-solr-test-framework, compile-test-solr-core, compile-test-solrj, compile-test-contrib, test-jsp"/>
-  <target name="javadocs" description="Calls javadocs-all" depends="javadocs-all"/>
+  <target name="javadocs" description="Calls javadocs-all, javadocs-solrj, and javadocs-test-framework"
+          depends="javadocs-all,javadocs-solrj,javadocs-test-framework"/>
   <target name="compile-core" depends="compile-solr-core" unless="solr.core.compiled"/>
   
   <!-- Solr core targets -->
@@ -151,17 +152,22 @@
       <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.">
     <contrib-crawl target="test" failonerror="true"/>
   </target>
   
   <!-- test-framework targets -->
-  <target name="javadocs-test-framework">  <!-- Called from Jenkins build script --> 
+  <target name="javadocs-test-framework">
     <ant dir="test-framework" target="javadocs" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
-  	</ant>
+    </ant>
   </target>
   
   <!-- Webapp targets -->
diff --git a/solr/solrj/build.xml b/solr/solrj/build.xml
index c1dd6ae1bc1..b6d7b26662b 100644
--- a/solr/solrj/build.xml
+++ b/solr/solrj/build.xml
@@ -41,4 +41,11 @@
       </fileset>
     </copy>
   </target>
+
+  <target name="javadocs" depends="common-solr.javadocs">
+    <mkdir dir="${dest}/docs/api/solrj"/>
+    <copy todir="${dest}/docs/api/solrj">
+      <fileset dir="${javadoc.dir}"/>
+    </copy>
+  </target>
 </project>
diff --git a/solr/test-framework/build.xml b/solr/test-framework/build.xml
index 61790d3ccf5..5817668f23b 100644
--- a/solr/test-framework/build.xml
+++ b/solr/test-framework/build.xml
@@ -38,5 +38,12 @@
       <classpath refid="test.base.classpath"/>
     </compile>
   </target>
+
+  <target name="javadocs" depends="common-solr.javadocs">
+    <mkdir dir="${dest}/docs/api/test-framework"/>
+    <copy todir="${dest}/docs/api/test-framework">
+      <fileset dir="${javadoc.dir}"/>
+    </copy>
+  </target>
 </project>