diff --git a/doc/man/sieve-dump.1.in b/doc/man/sieve-dump.1.in
index 4a07e35cd76b9708496abbf933d3a44143a6ff50..a165c885eac7e40944fb87dbc8b8d48d05f30f9a 100644
--- a/doc/man/sieve-dump.1.in
+++ b/doc/man/sieve-dump.1.in
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2011 Pigeonhole authors, see the included COPYING file
-.TH "SIEVE\-DUMP" 1 "2011-11-19" "Pigeonhole for Dovecot v2.1" "Pigeonhole"
+.TH "SIEVE\-DUMP" 1 "2011-12-12" "Pigeonhole for Dovecot v2.1" "Pigeonhole"
 .\"------------------------------------------------------------------------
 .SH NAME
 sieve\-dump \- Pigeonhole\(aqs Sieve script binary dump tool
@@ -47,16 +47,19 @@ human\-readable output.
 .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
-\fB\-\fP, extensions can be included or excluded relative to the default set of
-extensions. If no extensions have a \fB+\fP or \fB\-\fP prefix, only those
-extensions that are explicitly listed will be enabled. Unknown extensions are
-ignored and a warning is produced. By default, all supported extensions are
-available, except for deprecated extensions or those that are still under
-development.
+\fB\-\fP, extensions can be included or excluded relative to the configured set
+of active extensions. If no extensions have a \fB+\fP or \fB\-\fP prefix, only
+those extensions that are explicitly listed will be enabled. Unknown extensions
+are ignored and a warning is produced.
 
 For example \fB\-x\fP \(dq+imapflags \-enotify\(dq will enable the deprecated
-imapflags extension along with all extensions that are available by default,
-except for the enotify extension.
+imapflags extension and disable the enotify extension. The rest of the active
+extensions depends on the \fIsieve_extensions\fP and 
+\fIsieve_global_extensions\fP settings. By default, i.e.
+when \fIsieve_extensions\fP and \fIsieve_global_extensions\fP remain
+unconfigured, all supported extensions are available, except for deprecated
+extensions or those that are still under development.
+
 .\"------------------------------------------------------------------------
 .SH ARGUMENTS
 .TP
diff --git a/doc/man/sieve-filter.1.in b/doc/man/sieve-filter.1.in
index bb3421ee967272382b35b71050d2e382b6ccb708..e05cd2af0bd2a727cc5f1dea92c256be58cb5aa2 100644
--- a/doc/man/sieve-filter.1.in
+++ b/doc/man/sieve-filter.1.in
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2011 Pigeonhole authors, see the included COPYING file
-.TH "SIEVE\-FILTER" 1 "2011-11-19" "Pigeonhole for Dovecot v2.1" "Pigeonhole"
+.TH "SIEVE\-FILTER" 1 "2011-12-12" "Pigeonhole for Dovecot v2.1" "Pigeonhole"
 .SH NAME
 sieve\-filter \- Pigeonhole\(aqs Sieve mailbox filter tool
 
@@ -125,16 +125,18 @@ keywords.
 .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
-\fB\-\fP, extensions can be included or excluded relative to the default set of
-extensions. If no extensions have a \fB+\fP or \fB\-\fP prefix, only those
-extensions that are explicitly listed will be enabled. Unknown extensions are
-ignored and a warning is produced. By default, all supported extensions are
-available, except for deprecated extensions or those that are still under
-development.
+\fB\-\fP, extensions can be included or excluded relative to the configured set
+of active extensions. If no extensions have a \fB+\fP or \fB\-\fP prefix, only
+those extensions that are explicitly listed will be enabled. Unknown extensions
+are ignored and a warning is produced.
 
 For example \fB\-x\fP \(dq+imapflags \-enotify\(dq will enable the deprecated
-imapflags extension along with all extensions that are available by default,
-except for the enotify extension.
+imapflags extension and disable the enotify extension. The rest of the active
+extensions depends on the \fIsieve_extensions\fP and 
+\fIsieve_global_extensions\fP settings. By default, i.e.
+when \fIsieve_extensions\fP and \fIsieve_global_extensions\fP remain
+unconfigured, all supported extensions are available, except for deprecated
+extensions or those that are still under development.
 
 .\"------------------------------------------------------------------------
 .SH ARGUMENTS
diff --git a/doc/man/sieve-test.1.in b/doc/man/sieve-test.1.in
index 9caf39316bd47bd79815cf812e7166c861b69ada..2220c833200eadeaf67690ea7ca5c65ffe915b4b 100644
--- a/doc/man/sieve-test.1.in
+++ b/doc/man/sieve-test.1.in
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2011 Pigeonhole authors, see the included COPYING file
-.TH "SIEVE\-TEST" 1 "2011-11-19" "Pigeonhole for Dovecot v2.1" "Pigeonhole"
+.TH "SIEVE\-TEST" 1 "2011-12-12" "Pigeonhole for Dovecot v2.1" "Pigeonhole"
 .SH NAME
 sieve\-test \- Pigeonhole\(aqs Sieve script tester
 .\"------------------------------------------------------------------------
@@ -112,16 +112,19 @@ Refer to the runtime trace debugging section below.
 .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
-\fB\-\fP, extensions can be included or excluded relative to the default set of
-extensions. If no extensions have a \fB+\fP or \fB\-\fP prefix, only those
-extensions that are explicitly listed will be enabled. Unknown extensions are
-ignored and a warning is produced. By default, all supported extensions are
-available, except for deprecated extensions or those that are still under
-development.
+\fB\-\fP, extensions can be included or excluded relative to the configured set
+of active extensions. If no extensions have a \fB+\fP or \fB\-\fP prefix, only
+those extensions that are explicitly listed will be enabled. Unknown extensions
+are ignored and a warning is produced.
 
 For example \fB\-x\fP \(dq+imapflags \-enotify\(dq will enable the deprecated
-imapflags extension along with all extensions that are available by default,
-except for the enotify extension.
+imapflags extension and disable the enotify extension. The rest of the active
+extensions depends on the \fIsieve_extensions\fP and 
+\fIsieve_global_extensions\fP settings. By default, i.e.
+when \fIsieve_extensions\fP and \fIsieve_global_extensions\fP remain
+unconfigured, all supported extensions are available, except for deprecated
+extensions or those that are still under development.
+
 .\"------------------------------------------------------------------------
 .SH ARGUMENTS
 .TP
diff --git a/doc/man/sievec.1.in b/doc/man/sievec.1.in
index 188875924ec08b1e4d09badd7b6a18c5a8cee6ec..209789f6799c26a8757edcdd4fef43069d5d3f67 100644
--- a/doc/man/sievec.1.in
+++ b/doc/man/sievec.1.in
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2011 Pigeonhole authors, see the included COPYING file
-.TH "SIEVEC" 1 "2011-11-19" "Pigeonhole for Dovecot v2.1" "Pigeonhole"
+.TH "SIEVEC" 1 "2011-12-12" "Pigeonhole for Dovecot v2.1" "Pigeonhole"
 .\"------------------------------------------------------------------------
 .SH NAME
 sievec \- Pigeonhole\(aqs Sieve script compiler
@@ -60,16 +60,19 @@ for a compiled Sieve binary file. Note that this option is not allowed when the
 .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
-\fB\-\fP, extensions can be included or excluded relative to the default set of
-extensions. If no extensions have a \fB+\fP or \fB\-\fP prefix, only
+\fB\-\fP, extensions can be included or excluded relative to the configured set
+of active extensions. If no extensions have a \fB+\fP or \fB\-\fP prefix, only
 those extensions that are explicitly listed will be enabled. Unknown extensions
-are ignored and a warning is produced. By default, all supported extensions are
-available, except for deprecated extensions or those that are still under
-development.
+are ignored and a warning is produced.
 
 For example \fB\-x\fP \(dq+imapflags \-enotify\(dq will enable the deprecated
-imapflags extension along with all extensions that are available by default,
-except for the enotify extension.
+imapflags extension and disable the enotify extension. The rest of the active
+extensions depends on the \fIsieve_extensions\fP and 
+\fIsieve_global_extensions\fP settings. By default, i.e.
+when \fIsieve_extensions\fP and \fIsieve_global_extensions\fP remain
+unconfigured, all supported extensions are available, except for deprecated
+extensions or those that are still under development.
+
 .\"------------------------------------------------------------------------
 .SH ARGUMENTS
 .TP