Index: solr/build.xml
===================================================================
--- solr/build.xml	(revision 1329049)
+++ solr/build.xml	(working copy)
@@ -542,6 +542,12 @@
       </solr-invoke-javadoc>
     </sequential>
   </target>
+
+  <!-- TODO: does solr have any other docs we should check? -->
+  <!-- TODO: also integrate checkJavaDocs.py, which does more checks -->
+  <target name="javadocs-lint" depends="javadocs">
+    <check-broken-links dir="build/docs"/> 
+  </target>
  
   <target name="generate-maven-artifacts" depends="install-maven-tasks">
     <sequential>
Index: build.xml
===================================================================
--- build.xml	(revision 1329049)
+++ build.xml	(working copy)
@@ -42,6 +42,15 @@
     </sequential>
   </target>
 
+  <target name="javadocs-lint">
+    <sequential>
+      <subant target="javadocs-lint" inheritall="false" failonerror="true">
+        <fileset dir="lucene" includes="build.xml" />
+        <!-- TODO: solr <fileset dir="solr" includes="build.xml" /> -->
+      </subant>
+    </sequential>
+  </target>
+
   <target name="validate" description="Validate dependencies, licenses, etc.">
     <sequential><subant target="validate" inheritall="false" failonerror="true">
         <fileset dir="lucene" includes="build.xml" />
Index: lucene/common-build.xml
===================================================================
--- lucene/common-build.xml	(revision 1329049)
+++ lucene/common-build.xml	(working copy)
@@ -1562,4 +1562,15 @@
       </copy>
     </sequential>
   </macrodef>
+
+  <macrodef name="check-broken-links">
+       <attribute name="dir"/>
+     <sequential>
+       <exec dir="." executable="${python.exe}" failonerror="true">
+         <arg line="${dev-tools.dir}/scripts/checkJavadocLinks.py"/>
+         <arg line="@{dir}"/>
+       </exec>
+     </sequential>
+  </macrodef>
+
 </project>
Index: lucene/build.xml
===================================================================
--- lucene/build.xml	(revision 1329049)
+++ lucene/build.xml	(working copy)
@@ -187,6 +187,12 @@
     depends="javadocs,changes-to-html,process-webpages"/>
   <target name="javadoc" depends="javadocs"/>
   <target name="javadocs" description="Generate javadoc" depends="javadocs-lucene-core, javadocs-modules, javadocs-test-framework"/>
+
+  <!-- we check for broken links across all documentation -->
+  <!-- TODO: also integrate checkJavaDocs.py, which does more checks -->
+  <target name="javadocs-lint" depends="documentation">
+    <check-broken-links dir="build/docs"/>
+  </target>
   
   <target name="process-webpages" depends="resolve-pegdown">
     <pathconvert pathsep="|" dirsep="/" property="buildfiles">