diff --git a/make/Main.gmk b/make/Main.gmk
index 230fec4140e..7dd1eaab7e7 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -382,6 +382,10 @@ else
   # header file used by jdk.jdwp libs.
   jdk.jdwp.agent-libs: jdk.jdi-gensrc
 
+  # The swing beans need to have java base properly generated to avoid errors
+  # in javadoc.
+  java.desktop-gensrc: java.base-gensrc
+
   # Explicitly add dependencies for special targets
   java.base-java: unpack-sec