diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk
index b0c9a7ecb14..b16cba126bd 100644
--- a/make/Javadoc.gmk
+++ b/make/Javadoc.gmk
@@ -499,6 +499,21 @@ TARGETS += $(httpserver)
 
 ################################################################################
 
+$(eval $(call SetupJavadocGeneration, httpclient, \
+    MODULES := jdk.incubator.httpclient, \
+    PACKAGES := \
+        jdk.incubator.http, \
+    API_ROOT := jre, \
+    DEST_DIR := incubator/httpclient/spec, \
+    TITLE := Java™ HTTP Client API (incubator module), \
+    FIRST_COPYRIGHT_YEAR := 2015, \
+    DISABLED_DOCLINT := accessibility missing syntax, \
+))
+
+TARGETS += $(httpclient)
+
+################################################################################
+
 $(eval $(call SetupJavadocGeneration, jsobject, \
     MODULES := jdk.jsobject, \
     PACKAGES := netscape.javascript, \
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index eeb82b0f118..bb990d0a6fc 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -48,7 +48,6 @@ BOOT_MODULES += \
     java.base \
     java.datatransfer \
     java.desktop \
-    java.httpclient \
     java.instrument \
     java.logging \
     java.management \
@@ -98,6 +97,7 @@ PLATFORM_MODULES += \
 
 PLATFORM_MODULES += \
     java.compiler \
+    jdk.incubator.httpclient \
     java.scripting \
     java.security.jgss \
     java.smartcardio \