Index: build/utils/download-api-client
==================================================================
--- build/utils/download-api-client
+++ build/utils/download-api-client
@@ -57,12 +57,25 @@
 fi
 
 kit_url="$(jq -crM .kit_url <<<"${info}")"
 if [ -z "${kit_filename}" ]; then
 	kit_filename="${kit_url//*\//}"
+	case "${kit_filename}" in
+		*.*)
+			kit_filename_base="${kit_filename//.*/}"
+			kit_filename_ext=".${kit_filename//*./}"
+			;;
+		*)
+			kit_filename_base="${kit_filename}"
+			kit_filename_ext=''
+			;;
+	esac
+	kit_filename_platform="$(jq -crM .platform <<<"${info}")"
+	kit_filename_tcl_version="$(jq -crM .tcl_version <<<"${info}")"
+	kit_filename="${kit_filename_base}-${kit_filename_platform}-${kit_filename_tcl_version}${kit_filename_ext}"
 fi
 
 curl -sSL "${kit_url}" > "${kit_filename}"
 chmod 755 "${kit_filename}"
 
 echo "Wrote: ${kit_filename}"
 exit 0

Index: build/web/building.cgi
==================================================================
--- build/web/building.cgi
+++ build/web/building.cgi
@@ -144,10 +144,13 @@
 	if {[string tolower $status] eq "complete"} {
 		dict set resultsDict kit_url $url
 	}
 	if {[string tolower $status] in {complete building}} {
 		dict set resultsDict build_log_url $build_log_url
+		dict set resultsDict tcl_version $buildinfo(tcl_version)
+		dict set resultsDict kitcreator_version $buildinfo(kitcreator_version)
+		dict set resultsDict platform $buildinfo(platform)
 	}
 }
 
 switch -exact -- $resultFormat {
 	"html" {