diff --git a/configure.ac b/configure.ac
index 8647bdd72f5d..682d5dd2569b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12107,10 +12107,12 @@ AC_SUBST(PROGRESSTEXTCOLOR)
 AC_SUBST(PROGRESSTEXTBASELINE)
 
 
-EXTRA_BUILDID=
 AC_MSG_CHECKING([for extra build ID])
 if test -n "$with_extra_buildid" -a "$with_extra_buildid" != "yes" ; then
     EXTRA_BUILDID="$with_extra_buildid"
+fi
+# in tinderboxes, it is easier to set EXTRA_BUILDID via the environment variable instead of configure switch
+if test -n "$EXTRA_BUILDID" ; then
     AC_MSG_RESULT([$EXTRA_BUILDID])
 else
     AC_MSG_RESULT([not set])