Index: build/web/building.cgi
==================================================================
--- build/web/building.cgi
+++ build/web/building.cgi
@@ -71,10 +71,15 @@
 			}
 			"staticlibssl" {
 				if {$value} {
 					append description ", Statically linked to LibSSL"
 				}
+			}
+			"staticpkgs" {
+				if {$value} {
+					append description ", With Tcl 8.6+ pkgs/ directory all packages statically linked in"
+				}
 			}
 			"storage" {
 				switch -- $value {
 					"mk4" {
 						append description ", Metakit-based"

Index: build/web/kitcreator.vfs/index.rvt
==================================================================
--- build/web/kitcreator.vfs/index.rvt
+++ build/web/kitcreator.vfs/index.rvt
@@ -122,10 +122,13 @@
 					set build_options(minbuild) 1
 				}
 				"option_staticlibssl" {
 					set build_options(staticlibssl) 1
 				}
+				"option_staticpkgs" {
+					set build_options(staticpkgs) 1
+				}
 				"option_storage" {
 					switch -- $args($arg) {
 						"mk4" - "zip" - "cvfs" {
 							set build_options(storage) $args($arg)
 						}
@@ -362,10 +365,11 @@
             <input type="checkbox" name="option_debug">Kit: Debugging Build<br>
             <input type="checkbox" name="option_kitdll" id="option_kitdll">Kit: Build Library (KitDLL)<br>
             <input type="checkbox" name="option_dynamictk" id="option_dynamictk">Kit: Always link Tk dynamically (if Tk is built)<br>
             <input type="checkbox" name="option_minbuild">Kit: "Minimal" build (remove extra packages shipped as part of Tcl and reduce encodings)<br>
             <input type="checkbox" name="option_staticlibssl">TLS: Statically link to LibSSL
+            <input type="checkbox" name="option_staticpkgs">Kit: Statically link packages in pkgs directory
           </td>
         </tr>
 	<tr>
 		<td>Kit Storage:</td>
 		<td>

Index: build/web/process_queue
==================================================================
--- build/web/process_queue
+++ build/web/process_queue
@@ -106,10 +106,15 @@
 			}
 			"staticlibssl" {
 				if {$value} {
 					set ::env(KC_TLS_LINKSSLSTATIC) 1
 				}
+			}
+			"staticpkgs" {
+				if {$value} {
+					set ::env(KC_TCL_STATICPKGS) 1
+				}
 			}
 			"staticmk4" {
 			}
 		}
 	}
@@ -125,11 +130,11 @@
 	catch {
 		set cmd [list $script $buildinfo(tcl_version) {*}$args]
 		set fd [open "${outfile}.log" w+]
 		puts $fd "Running: export KITCREATOR_PKGS=\"$::env(KITCREATOR_PKGS)\""
 
-		foreach variable [list STRIP STATICTK KITCREATOR_MINENCODINGS KITCREATOR_MINBUILD KC_TLS_LINKSSLSTATIC] {
+		foreach variable [list STRIP STATICTK KITCREATOR_MINENCODINGS KITCREATOR_MINBUILD KC_TLS_LINKSSLSTATIC KC_TCL_STATICPKGS] {
 			if {[info exists ::env($variable)]} {
 				puts $fd "Running: export $variable=\"$::env($variable)\""
 			}
 		}