diff --git a/make/Main.gmk b/make/Main.gmk
index 6a800a2edd5..c1b84dc1855 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -417,12 +417,22 @@ $(eval $(call SetupTarget, create-source-revision-tracker, \
 ))
 
 BOOTCYCLE_TARGET := product-images
+BOOTCYCLE_SPEC := $(dir $(SPEC))bootcycle-spec.gmk
+
 bootcycle-images:
         ifneq ($(COMPILE_TYPE), cross)
 	  $(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
 	  $(call MakeDir, $(OUTPUTDIR)/bootcycle-build)
+          # We need to create essential files for the bootcycle spec dir
+	  ( cd $(TOPDIR) && \
+	        $(MAKE) $(MAKE_ARGS) -f make/GenerateFindTests.gmk \
+	         SPEC=$(BOOTCYCLE_SPEC))
+	  ( cd $(TOPDIR) && \
+	        $(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Main.gmk \
+	        SPEC=$(BOOTCYCLE_SPEC) UPDATE_MODULE_DEPS=true NO_RECIPES=true \
+	        create-main-targets-include )
 	  +$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
-	      LOG_PREFIX="[bootcycle] " JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
+	      LOG_PREFIX="[bootcycle] " JOBS= SPEC=$(BOOTCYCLE_SPEC) main
         else
 	  $(call LogWarn, Boot cycle build disabled when cross compiling)
         endif