diff --git a/make/common/CORE_PKGS.gmk b/make/common/CORE_PKGS.gmk
index 6a3ba63a243..eb6ac3d769e 100644
--- a/make/common/CORE_PKGS.gmk
+++ b/make/common/CORE_PKGS.gmk
@@ -103,6 +103,7 @@ CORE_PKGS = \
     java.lang.reflect \
     java.math \
     java.net \
+    java.net.http \
     java.net.spi \
     java.nio \
     java.nio.channels \
diff --git a/modules.xml b/modules.xml
index 458859b5327..75a523a8cc8 100644
--- a/modules.xml
+++ b/modules.xml
@@ -315,6 +315,10 @@
       <to>jdk.zipfs</to>
       <to>java.instrument</to>
     </export>
+    <export>
+      <name>sun.net</name>
+      <to>java.httpclient</to>
+    </export>
     <export>
       <name>sun.net.dns</name>
       <to>java.security.jgss</to>
@@ -496,6 +500,7 @@
       <to>java.logging</to>
       <to>java.management</to>
       <to>java.prefs</to>
+      <to>java.httpclient</to>
     </export>
     <export>
       <name>sun.util.resources</name>
@@ -520,6 +525,7 @@
     <depend re-exports="true">java.compact2</depend>
     <depend re-exports="true">java.compiler</depend>
     <depend re-exports="true">java.instrument</depend>
+    <depend re-exports="true">java.httpclient</depend>
     <depend re-exports="true">java.management</depend>
     <depend re-exports="true">java.naming</depend>
     <depend re-exports="true">java.prefs</depend>
@@ -837,6 +843,13 @@
       <name>jdk.jshell</name>
     </export>
   </module>
+  <module>
+    <name>java.httpclient</name>
+    <depend>java.base</depend>
+    <export>
+      <name>java.net.http</name>
+    </export>
+  </module>
   <module>
     <name>java.instrument</name>
     <depend>java.base</depend>