2 files changed, 9 insertions, 1 deletions

diff --git a/tools/tools/tinderbox/tbmaster.1 b/tools/tools/tinderbox/tbmaster.1
index 8bff37c66e7b8..64d824d638822 100644
--- a/tools/tools/tinderbox/tbmaster.1
+++ b/tools/tools/tinderbox/tbmaster.1
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 15, 2004
+.Dd June 14, 2004
 .Dt TBMASTER 1
 .Os
 .Sh NAME
@@ -168,6 +168,11 @@ This defaults to the name reported by the
 option of the
 .Xr uname 1
 command, and is only used for cosmetic purposes.
+.It JOBS
+The maximum number of concurrent
+.Xr make 1
+jobs to run.
+No default value.
 .It LOGDIR
 .Pq Vt single
 The location of the log directory.
diff --git a/tools/tools/tinderbox/tbmaster.pl b/tools/tools/tinderbox/tbmaster.pl
index 12d7a87f38ce2..2e92a96d7f47c 100644
--- a/tools/tools/tinderbox/tbmaster.pl
+++ b/tools/tools/tinderbox/tbmaster.pl
@@ -52,6 +52,7 @@ my %INITIAL_CONFIG = (
     'DATE'	=> '',
     'ENV'	=> [],
     'HOSTNAME'	=> '',
+    'JOBS'	=> '',
     'LOGDIR'	=> '%%SANDBOX%%/logs',
     'OPTIONS'	=> [],
     'PATCH'	=> '',
@@ -251,6 +252,8 @@ sub tinderbox($$$) {
 	if ($CONFIG{'DATE'});
     push(@args, "--patch=" . expand('PATCH'))
 	if ($CONFIG{'PATCH'});
+    push(@args, "--jobs=" . expand('JOBS'))
+	if ($CONFIG{'JOBS'});
     push(@args, @{$CONFIG{'TARGETS'}});
     push(@args, @{$CONFIG{'ENV'}});
     push(@args, "CFLAGS=" . expand('CFLAGS'))