2785c5
diff --git a/manpages/bacula-dir.8 b/manpages/bacula-dir.8
2785c5
index 50056e8..0486bf4 100644
2785c5
--- a/manpages/bacula-dir.8
2785c5
+++ b/manpages/bacula-dir.8
2785c5
@@ -37,6 +37,9 @@ Run in foreground (for debugging).
2785c5
 .BI \-g\  group
2785c5
 Set the group/gid to run as.
2785c5
 .TP
2785c5
+.BI \-m 
2785c5
+Print kaboom output (for debugging)
2785c5
+.TP
2785c5
 .BI \-r\  job
2785c5
 Run <job>.
2785c5
 .TP
2785c5
diff --git a/manpages/bacula-fd.8 b/manpages/bacula-fd.8
2785c5
index 2dfbf9e..d0b2169 100644
2785c5
--- a/manpages/bacula-fd.8
2785c5
+++ b/manpages/bacula-fd.8
2785c5
@@ -39,12 +39,12 @@ Run in foreground (for debugging).
2785c5
 .BI \-g\  group
2785c5
 Set the group/gid to run as.
2785c5
 .TP
2785c5
-.BI \-p
2785c5
-Proceed inspite of I/O errors
2785c5
-.TP
2785c5
 .BI \-k
2785c5
 Keep readall permission when dropping privileges.
2785c5
 .TP
2785c5
+.BI \-m
2785c5
+Print kaboom output (for debugging)
2785c5
+.TP
2785c5
 .BI \-s
2785c5
 No signals (for debugging).
2785c5
 .TP
2785c5
diff --git a/manpages/bacula-sd.8 b/manpages/bacula-sd.8
2785c5
index 6dd36dc..aed27a3 100644
2785c5
--- a/manpages/bacula-sd.8
2785c5
+++ b/manpages/bacula-sd.8
2785c5
@@ -40,6 +40,9 @@ Set the group/gid to run as.
2785c5
 .BI \-p
2785c5
 Proceed in spite of I/O errors
2785c5
 .TP
2785c5
+.BI \-m
2785c5
+Print kaboom output (for debugging)
2785c5
+.TP
2785c5
 .BI \-s
2785c5
 No signals (for debugging).
2785c5
 .TP
2785c5
diff --git a/manpages/bconsole.8 b/manpages/bconsole.8
2785c5
index a765b2e..d12bd2d 100644
2785c5
--- a/manpages/bconsole.8
2785c5
+++ b/manpages/bconsole.8
2785c5
@@ -18,6 +18,12 @@ command.
2785c5
 .PP
2785c5
 .SH OPTIONS
2785c5
 .TP
2785c5
+.BI \-D\  dir
2785c5
+Select a Director.
2785c5
+.TP
2785c5
+.BI \-l
2785c5
+List defined Directors.
2785c5
+.TP
2785c5
 .BI \-c\  config
2785c5
 Specify configuration file.
2785c5
 .TP
2785c5
@@ -33,6 +39,9 @@ No conio (for scripting).
2785c5
 .B \-s
2785c5
 No signals (for debugging).
2785c5
 .TP
2785c5
+.b \-u\  nn
2785c5
+Set command execution timeout to \fInn\fP seconds
2785c5
+.TP
2785c5
 .B \-t
2785c5
 Test the configuration file and report errors.
2785c5
 .TP
2785c5
diff --git a/manpages/btape.8 b/manpages/btape.8
2785c5
index dff8d0e..3a149dc 100644
2785c5
--- a/manpages/btape.8
2785c5
+++ b/manpages/btape.8
2785c5
@@ -38,9 +38,6 @@ Set debug level to \fInn\fP.
2785c5
 .BI \-p
2785c5
 Proceed inspite of I/O errors.
2785c5
 .TP
2785c5
-.B \-t
2785c5
-Open the default tape device.
2785c5
-.TP
2785c5
 .B \-s
2785c5
 No signals (for debugging).
2785c5
 .TP
2785c5
diff --git a/src/console/console.c b/src/console/console.c
2785c5
index 999515f..40ca8f6 100644
2785c5
--- a/src/console/console.c
2785c5
+++ b/src/console/console.c
2785c5
@@ -1019,7 +1019,7 @@ int main(int argc, char *argv[])
2785c5
    working_directory = "/tmp";
2785c5
    args = get_pool_memory(PM_FNAME);
2785c5
 
2785c5
-   while ((ch = getopt(argc, argv, "D:lbc:d:nstu:?")) != -1) {
2785c5
+   while ((ch = getopt(argc, argv, "D:lc:d:nstu:?")) != -1) {
2785c5
       switch (ch) {
2785c5
       case 'D':                    /* Director */
2785c5
          if (director) {