--- a/make/Main.gmk	Mon May 16 12:33:22 2016 +0200
+++ b/make/Main.gmk	Thu May 19 17:24:50 2016 +0200
@@ -596,7 +596,8 @@
   # When creating a BUILDJDK, we don't need to add hashes to java.base, thus
   # we don't need to depend on all other jmods
   ifneq ($(CREATING_BUILDJDK), true)
-    java.base-jmod: $(filter-out java.base-jmod, $(JMOD_TARGETS))
+    java.base-jmod: $(filter-out java.base-jmod \
+        $(addsuffix -jmod, $(call FindAllUpgradeableModules)), $(JMOD_TARGETS))
   endif
 
   # Declare dependencies from <module>-jmod to all other module targets