--- a/langtools/make/build.properties	Wed Aug 27 11:41:03 2014 +0100
+++ b/langtools/make/build.properties	Wed Aug 27 06:25:17 2014 -0700
@@ -128,17 +128,11 @@
 
 javadoc.includes = \
         com/sun/javadoc/ \
-        com/sun/tools/javadoc/
+        com/sun/tools/javadoc/ \
+        com/sun/tools/doclets/
 
 javadoc.tests = \
-        tools/javadoc/
-
-#
-
-doclets.includes = \
-        com/sun/tools/doclets/
-
-doclets.tests = \
+        tools/javadoc/ \
         com/sun/javadoc/
 
 #