diff --git a/documentation/configuring.sgml b/documentation/configuring.sgml
index c42093a..00c64dd 100644
--- a/documentation/configuring.sgml
+++ b/documentation/configuring.sgml
@@ -852,7 +852,7 @@
           <para>
             In both entries the functions may be specified either as a 
             function name or as a module and function.  In this latter
-            case specify an asterisk for the function name to include
+            case specify an asterisk for the function name to include/exclude
             all functions in the module.
           </para>
           <para>
diff --git a/documentation/wine.conf.man b/documentation/wine.conf.man
index e2fd3ec..9062d1e 100644
--- a/documentation/wine.conf.man
+++ b/documentation/wine.conf.man
@@ -260,19 +260,47 @@
 .br
 Used to specify the devices which are used as LPT1 - LPT8.
 .PP
-.B [spy]
+.B [Debug]
 .br
-.I format: """exclude""=""<message names separated by semicolons>"""
+.I format: """SpyExclude""=""<message names separated by semicolons>"""
 .br
 default: none
 .br
 Used to specify which messages will be excluded from the logfile.
 .PP
-.I format: """include""=""<message names separated by semicolons>"""
+.I format: """SpyInclude""=""<message names separated by semicolons>"""
 .br
 default: none
 .br Used to specify which messages will be included in the logfile.
 .PP
+.I format: """RelayExclude""=""<function or dll.functions separated by semicolons>"""
+.br
+default: none
+.br
+Used to specify which function will be excluded from a relay debuglog.
+.PP
+.I format: """RelayInclude""=""<message names separated by semicolons>"""
+.br
+default: none
+.br 
+Used to specify which function will be included in relay debuglog.
+.PP
+.I format: """SnoopExclude""=""<message names separated by semicolons>"""
+.br
+default: none
+.br 
+Used to specify which function will be included in snoop debuglog.
+.PP
+.I format: """SnoopInclude""=""<message names separated by semicolons>"""
+.br
+default: none
+.br 
+Used to specify which function will be included in snoop debuglog.
+.PP
+For Relay and Snoop <dllname>.* includes or excludes the whole dll. Exclude
+entries overwrite Include Entries.
+.br
+.PP
 .B [Tweak.Layout]
 .br
 .I format: """WineLook""=""<Win31|Win95|Win98>"""
diff --git a/documentation/wine.man.in b/documentation/wine.man.in
index 06ca461..9da3538 100644
--- a/documentation/wine.man.in
+++ b/documentation/wine.man.in
@@ -43,7 +43,7 @@
 man page to know what Wine requires and how it is installed from source.
 .SH OPTIONS
 .TP
-.I --debugmsg [xxx]#name[,[xxx1]#name1][,<+|->relay=yyy1[:yyy2]]
+.I --debugmsg [xxx]#name[,[xxx1]#name1]
 Turn debugging messages on or off.  
 .RS +7
 .PP
@@ -75,14 +75,9 @@
 will turn off all FIXME messages, turn on cursor warning messages, and turn
 on all relay messages (API calls).
 .br 
-.I --debugmsg -relay=rtlleavecriticalsection:RtlEnterCriticalSection
-will turn on all relay messages except for RtlLeaveCriticalSection and
-RtlEnterCriticalSection.
-.br 
-.I --debugmsg +relay=advapi32
-will only turn on relay messages into the ADVAPI32 code.
-Never ever use simply --debugmsg +all ! Way too much info, and it crashes
-way too easily, thus confusing unexperienced users.
+.I --debugmsg -relay
+will turn on all relay messages. For more control on including or excluding
+functions and dlls look into the [Debug] section of the wine configuration file.
 .PP
 The full list of names is:
 all, accel, advapi, animate, aspi, atom, avifile, bitblt, bitmap, caret,