--- jsr166/build.xml	2014/06/25 08:29:01	1.156
+++ jsr166/build.xml	2014/07/08 00:01:39	1.157
@@ -166,14 +166,12 @@
   <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
   <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
   <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
-  <!-- The expected canonical location does not yet exist as of 2014-02 -->
-  <!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> -->
-  <property name="java8.docroot.url"      value="http://download.java.net/jdk8/docs"/>
-  <!-- No published jdk9 docs exist as of 2014-02 -->
+  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
+  <!-- The expected canonical location does not yet exist as of 2014-07 -->
   <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
-  <property name="java9.docroot.url"      value="${java8.docroot.url}"/>
+  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
   <!-- Default jdk doc location (latest stable release seems best) -->
-  <property name="java.docroot.url"       value="${java7.docroot.url}"/>
+  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
 
   <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
   <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>