Index: build/web/kitcreator.vfs/index.rvt
==================================================================
--- build/web/kitcreator.vfs/index.rvt
+++ build/web/kitcreator.vfs/index.rvt
@@ -69,10 +69,11 @@
 
 		## Optional Arguments
 		set build_packages [list]
 		set build_options(threaded) 0
 		set build_options(kitdll) 0
+		set build_options(debug) 0
 		foreach arg [array names args] {
 			switch -glob -- $arg {
 				"option_package_*" {
 					set package [join [lrange [split $arg _] 2 end] _]
 
@@ -82,10 +83,13 @@
 					set build_options(threaded) 1
 				}
 				"option_kitdll" {
 					set build_options(kitdll) 1
 				}
+				"option_debug" {
+					set build_options(debug) 1
+				}
 				"option_storage" {
 					switch -- $args($arg) {
 						"mk4" - "zip" - "cvfs" {
 							set build_options(storage) $args($arg)
 						}
@@ -138,11 +142,11 @@
 		set key [list $secret $build_platform $cache_tcl_version $cache_kitcreator_version $build_packages]
 
 		## Update key with options in deterministic order
 		foreach option [lsort -dictionary [array names build_options]] {
 			switch -- $option {
-				"threaded" - "kitdll" {
+				"threaded" - "kitdll" - "debug" {
 					# For boolean options, skip them if they are not enabled
 					if {!$build_options($option)} {
 						continue
 					}
 				}
@@ -308,10 +312,11 @@
           <td>
 <?  foreach package [lsort -dictionary [array names packages]] { ?>
             <input type="checkbox" name="option_package_<? puts -nonewline $package ?>" id="option_package_<? puts -nonewline $package ?>">Package: <? puts -nonewline $packages($package) ?><br>
 <? } ?>
             <input type="checkbox" name="option_threaded">Kit: Threaded<br>
+            <input type="checkbox" name="option_debug">Kit: Debugging Build<br>
             <input type="checkbox" name="option_kitdll">Kit: Build Library (KitDLL)<br>
           </td>
         </tr>
 	<tr>
 		<td>Kit Storage:</td>

Index: build/web/process_queue
==================================================================
--- build/web/process_queue
+++ build/web/process_queue
@@ -67,10 +67,16 @@
 				if {$value} {
 					lappend args "--enable-threads"
 				} else {
 					lappend args "--disable-threads"
 				}
+			}
+			"debug" {
+				if {$value} {
+					lappend args "--enable-symbols"
+					set ::env(STRIP) true
+				}
 			}
 			"storage" {
 				lappend args "--enable-kit-storage=$value"
 			}
 			"staticmk4" {
@@ -83,14 +89,22 @@
 	catch {
 		exec ./build/pre.sh
 	}
 
 	catch {
-		set fd [open "${outfile}.log" w]
-		puts $fd "Running: [list $script $buildinfo(tcl_version) {*}$args]"
+		file delete "${outfile}.log"
+	}
+
+	catch {
+		set cmd [list $script $buildinfo(tcl_version) {*}$args]
+		set fd [open "${outfile}.log" w+]
+		puts $fd "Running: $cmd"
 		close $fd
-		exec $script $buildinfo(tcl_version) {*}$args > "${outfile}.log" 2>@1
+	}
+
+	catch {
+		exec {*}$cmd >> "${outfile}.log" 2>@1
 	}
 
 	catch {
 		exec grep ^ {*}[glob */build.log] >> "${outfile}.log"
 	}