diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8
index 0eb3eb8cb3a9..28ed80bf1fd9 100644
--- a/sbin/quotacheck/quotacheck.8
+++ b/sbin/quotacheck/quotacheck.8
@@ -31,7 +31,7 @@
 .\"     @(#)quotacheck.8	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd June 5, 1993
+.Dd November 7, 2006
 .Dt QUOTACHECK 8
 .Os
 .Sh NAME
@@ -40,6 +40,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl guv
+.Op Fl l Ar maxrun
 .Fl a
 .Nm
 .Op Fl guv
@@ -72,6 +73,13 @@ are checked.
 Only group quotas listed in
 .Pa /etc/fstab
 are to be checked.
+.It Fl l Ar maxrun
+Specifies the maximum number of concurrent file systems
+to check in parallel.
+If this option is omitted, or if
+.Ar maxrun
+is zero, parallel passes are run as per
+.Xr fsck 8 .
 .It Fl u
 Only user quotas listed in
 .Pa /etc/fstab
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 634124e11043..b0a7df9ff393 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -192,6 +192,12 @@ main(argc, argv)
 			(void) addid((u_long)pw->pw_uid, USRQUOTA, pw->pw_name);
 		endpwent();
 	}
+	/*
+	 * Setting maxrun (-l) makes no sense without the -a flag.
+	 * Historically this was never an error, so we just warn.
+	 */
+	if (maxrun > 0 && !aflag)
+		warnx("ignoring -l without -a");
 	if (aflag)
 		exit(checkfstab(1, maxrun, needchk, chkquota));
 	if (setfsent() == 0)
@@ -217,7 +223,7 @@ void
 usage()
 {
 	(void)fprintf(stderr, "%s\n%s\n", 
-		"usage: quotacheck [-guv] -a",
+		"usage: quotacheck [-guv] [-l maxrun] -a",
 		"       quotacheck [-guv] filesystem ...");
 	exit(1);
 }