--- old/jdk/make/CompileDemos.gmk	2016-01-14 11:38:10.275032804 +0100
+++ new/jdk/make/CompileDemos.gmk	2016-01-14 11:38:10.107025750 +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 =