diff --git a/build.properties b/build.properties
index 1a9e14a92..56feb7658 100644
--- a/build.properties
+++ b/build.properties
@@ -17,3 +17,6 @@ version=2.1
 # http://code.google.com/webtoolkit/
 # It builds against GWT 2.4 at the moment.
 #GWT-home=/usr/local/gwt
+
+# Needed for fancy Javadoc generation
+#java7.home=/Library/Java/JavaVirtualMachines/1.7.0.jdk/Contents/Home
diff --git a/build.xml b/build.xml
index 8cdfb6be9..bb78844a7 100644
--- a/build.xml
+++ b/build.xml
@@ -54,7 +54,8 @@
   <target name="javadoc">
     <delete dir="docs/javadoc"/>
     <mkdir dir="docs/javadoc"/>
-    <javadoc failonerror="true"
+    <javadoc executable="${java7.home}/bin/javadoc"
+             failonerror="true"
              destdir="docs/javadoc"
              footer="
                &lt;script type=&quot;text/javascript&quot;&gt;;
@@ -69,6 +70,7 @@
                &lt;/script&gt;">
       <sourcepath>
         <pathelement location="android/src"/>
+        <pathelement location="android-integration/src"/>
         <pathelement location="android/gen"/>        
         <pathelement location="core/src"/>
         <pathelement location="javase/src"/>