Index: bin/autobuild
==================================================================
--- bin/autobuild
+++ bin/autobuild
@@ -104,10 +104,18 @@
 eval "${config}"
 
 if [ -f ~/.fossil-ci/"${projectName}"/config ]; then
 	. ~/.fossil-ci/"${projectName}"/config
 fi
+
+## 5.d. Post-process config
+### 5.d.i. Add builderID as a tag suffix if none was given
+if [ -z "${tagSuffix}" ]; then
+	if [ -n "${builderID}" ]; then
+		tagSuffix="-${builderID}"
+	fi
+fi
 
 # 6. Perform any configured initialization
 for cmd in "${initCommands[@]}"; do
 	eval "${cmd}" >/dev/null 2>/dev/null || :
 done