diff --git a/doc/man/sieve-dump.1.in b/doc/man/sieve-dump.1.in
index 91c2b15a9ade68923a97a0bd60b89df9e67edb3e..f02958e305013e0c92b8a688d8595f2ffeec94bc 100644
--- a/doc/man/sieve-dump.1.in
+++ b/doc/man/sieve-dump.1.in
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2016 Pigeonhole authors, see the included COPYING file
-.TH "SIEVE\-DUMP" 1 "2014-01-01" "Pigeonhole for Dovecot v2.2" "Pigeonhole"
+.TH "SIEVE\-DUMP" 1 "2016-04-05" "Pigeonhole for Dovecot v2.2" "Pigeonhole"
 .\"------------------------------------------------------------------------
 .SH NAME
 sieve\-dump \- Pigeonhole\(aqs Sieve script binary dump tool
@@ -47,6 +47,22 @@ Enable Sieve debugging.
 Produce per\-block hexdump output of the whole binary instead of the normal
 human\-readable output.
 .TP
+.BI \-o\  setting = value
+Overrides the configuration
+.I setting
+from
+.I @pkgsysconfdir@/dovecot.conf
+and from the userdb with the given
+.IR value .
+In order to override multiple settings, the
+.B \-o
+option may be specified multiple times.
+.TP
+.BI \-u\  user
+Run the Sieve script for the given \fIuser\fP. When omitted, the
+.I command
+will be executed with the environment of the currently logged in user.
+.TP
 .BI \-x\  extensions
 Set the available extensions. The parameter is a space\-separated list of the
 active extensions. By prepending the extension identifiers with \fB+\fP or
diff --git a/doc/man/sieve-filter.1.in b/doc/man/sieve-filter.1.in
index c97c33d0b1348fb36b416dd57e94f96a9cbaf65e..a2b10169546ceeab446fd8b9abaf0600b8cbe3a8 100644
--- a/doc/man/sieve-filter.1.in
+++ b/doc/man/sieve-filter.1.in
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2016 Pigeonhole authors, see the included COPYING file
-.TH "SIEVE\-FILTER" 1 "2014-01-01" "Pigeonhole for Dovecot v2.2" "Pigeonhole"
+.TH "SIEVE\-FILTER" 1 "2016-04-05" "Pigeonhole for Dovecot v2.2" "Pigeonhole"
 .SH NAME
 sieve\-filter \- Pigeonhole\(aqs Sieve mailbox filter tool
 
@@ -95,6 +95,17 @@ messages to the indicated folder, instead of just leaving them in the
 \fIsource\-mailbox\fP. Refer to the explanation of the \fIsource\-mailbox\fP
 argument for more information on mailbox naming.
 .TP
+.BI \-o\  setting = value
+Overrides the configuration
+.I setting
+from
+.I @pkgsysconfdir@/dovecot.conf
+and from the userdb with the given
+.IR value .
+In order to override multiple settings, the
+.B \-o
+option may be specified multiple times.
+.TP
 .BI \-q\  output\-mailbox\  \fB[not\ implemented\ yet]\fP
 Store outgoing e\-mail into the indicated \fIoutput\-mailbox\fP. By default,
 the sieve\-filter command ignores Sieve actions such as redirect, reject,
@@ -116,7 +127,9 @@ Specify additional scripts to be executed before the main script. Multiple
 sequentially in the order specified at the command line.
 .TP
 .BI \-u\  user
-Run the Sieve script for the given \fIuser\fP.
+Run the Sieve script for the given \fIuser\fP. When omitted, the
+.I command
+will be executed with the environment of the currently logged in user.
 .TP
 .B \-v
 Produce verbose output during filtering.
diff --git a/doc/man/sieve-test.1.in b/doc/man/sieve-test.1.in
index 7bdf783b73d96f10a33a8796aa3f0fd9d713d201..cd415458a967423b71eff11a28bd6d545becf564 100644
--- a/doc/man/sieve-test.1.in
+++ b/doc/man/sieve-test.1.in
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2016 Pigeonhole authors, see the included COPYING file
-.TH "SIEVE\-TEST" 1 "2014-01-01" "Pigeonhole for Dovecot v2.2" "Pigeonhole"
+.TH "SIEVE\-TEST" 1 "2016-04-05" "Pigeonhole for Dovecot v2.2" "Pigeonhole"
 .SH NAME
 sieve\-test \- Pigeonhole\(aqs Sieve script tester
 .\"------------------------------------------------------------------------
@@ -86,6 +86,17 @@ fileinto and keep are skipped.
 The mailbox where the keep action stores the message. This is \(dqINBOX\(dq
 by default.
 .TP
+.BI \-o\  setting = value
+Overrides the configuration
+.I setting
+from
+.I @pkgsysconfdir@/dovecot.conf
+and from the userdb with the given
+.IR value .
+In order to override multiple settings, the
+.B \-o
+option may be specified multiple times.
+.TP
 .BI \-r\  recipient\-address
 The final envelope recipient address. Some tests and actions will
 use this as the script owner\(aqs e\-mail address. For example, this is what is
@@ -109,6 +120,11 @@ Using '\-' as filename causes the trace data to be written to \fBstdout\fP.
 Configures runtime trace debugging, which is enabled with the \fP\-t\fP option.
 Refer to the runtime trace debugging section below.
 .TP
+.BI \-u\  user
+Run the Sieve script for the given \fIuser\fP. When omitted, the
+.I command
+will be executed with the environment of the currently logged in user.
+.TP
 .BI \-x\  extensions
 Set the available extensions. The parameter is a space\-separated list of the
 active extensions. By prepending the extension identifiers with \fB+\fP or
diff --git a/doc/man/sievec.1.in b/doc/man/sievec.1.in
index 6653ce5a102684cfa91d11af678aa6cb5dc4664f..99772fe1598c967792c62b7c864b57c859829f6a 100644
--- a/doc/man/sievec.1.in
+++ b/doc/man/sievec.1.in
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2016 Pigeonhole authors, see the included COPYING file
-.TH "SIEVEC" 1 "2014-01-01" "Pigeonhole for Dovecot v2.2" "Pigeonhole"
+.TH "SIEVEC" 1 "2016-04-05" "Pigeonhole for Dovecot v2.2" "Pigeonhole"
 .\"------------------------------------------------------------------------
 .SH NAME
 sievec \- Pigeonhole\(aqs Sieve script compiler
@@ -60,6 +60,22 @@ for a compiled Sieve binary file. Note that this option is not allowed when the
 .B \-D
 Enable Sieve debugging.
 .TP
+.BI \-o\  setting = value
+Overrides the configuration
+.I setting
+from
+.I @pkgsysconfdir@/dovecot.conf
+and from the userdb with the given
+.IR value .
+In order to override multiple settings, the
+.B \-o
+option may be specified multiple times.
+.TP
+.BI \-u\  user
+Run the Sieve script for the given \fIuser\fP. When omitted, the
+.I command
+will be executed with the environment of the currently logged in user.
+.TP
 .BI \-x\  extensions
 Set the available extensions. The parameter is a space\-separated list of the
 active extensions. By prepending the extension identifiers with \fB+\fP or