--- old/make/conf/jib-profiles.js	2018-06-08 14:40:38.279835696 -0700
+++ new/make/conf/jib-profiles.js	2018-06-08 14:40:38.063835704 -0700
@@ -415,7 +415,9 @@
             target_cpu: "x64",
             dependencies: ["devkit", "autoconf", "graphviz", "pandoc"],
             configure_args: concat(common.configure_args_64bit,
-                "--enable-full-docs", "--with-zlib=system"),
+                "--enable-full-docs", "--with-zlib=system",
+                "--with-jvm-variants=server,hardened",
+                "--enable-hardened-jdk"),
             default_make_targets: ["docs-bundles"],
         },
 
@@ -449,14 +451,16 @@
             target_cpu: "sparcv9",
             dependencies: ["devkit", "autoconf", "cups"],
             configure_args: concat(common.configure_args_64bit,
-                "--with-zlib=system", "--enable-dtrace"),
+                "--with-zlib=system", "--enable-dtrace")
         },
 
         "windows-x64": {
             target_os: "windows",
             target_cpu: "x64",
             dependencies: ["devkit", "autoconf"],
-            configure_args: concat(common.configure_args_64bit),
+            configure_args: concat(common.configure_args_64bit,
+                "--with-jvm-variants=server,hardened",
+                "--enable-hardened-jdk"),
         },
 
         "windows-x86": {