--- a/jdk/make/CompileDemos.gmk	Sat Jan 16 00:18:33 2016 +0000
+++ b/jdk/make/CompileDemos.gmk	Sat Jan 16 13:01:44 2016 +0100
@@ -38,7 +38,8 @@
 include ZipArchive.gmk
 
 # Prepare the find cache.
-$(eval $(call FillCacheFind, $(JDK_TOPDIR)/src))
+$(eval $(call FillCacheFind, $(wildcard $(JDK_TOPDIR)/src/demo \
+    $(JDK_TOPDIR)/src/*/demo)))
 
 # Append demo goals to this variable.
 TARGETS =