18 files changed, 63 insertions, 66 deletions
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index 538230ee82..fd0c6809a7 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -2526,12 +2526,6 @@ error. Unfortunately WfWg totally ignores the error code and carries
 on regardless, saying that the message was delivered.
 <p><br>If you want to silently delete it then try:
 <p><br><code>"message command = rm %s"</code>.
-<p><br>For the really adventurous, try something like this:
-<p><br><code>message command = csh -c 'csh &lt; %s |&amp; /usr/local/samba/bin/smbclient -M %m; rm %s' &amp;</code>
-<p><br>this would execute the command as a script on the server, then give
-them the result in a WinPopup message. Note that this could cause a
-loop if you send a message from the server using smbclient! You better
-wrap the above in a script that checks for this :-)
 <p><br><strong>Default:</strong>
 <code>	no message command</code>
 <p><br><strong>Example:</strong>
diff --git a/docs/htmldocs/smbclient.1.html b/docs/htmldocs/smbclient.1.html
index 71a3b786bf..45823a56f9 100644
--- a/docs/htmldocs/smbclient.1.html
+++ b/docs/htmldocs/smbclient.1.html
@@ -297,11 +297,11 @@ share. The secondary tar flags that can be given to this option are :
 <p><br><li><strong><strong>I</strong></strong> Include files and directories. Is the default
 	behavior when filenames are specified above. Causes tar files to
 	be included in an extract or create (and therefore everything else to
-	be excluded). See example below.  Filename globbing does not work for
-	included files for extractions (yet).
+	be excluded). See example below.  Filename globbing works 
+	in one of two ways.  See <strong>r</strong> below.
 <p><br><li><strong><strong>X</strong></strong> Exclude files and directories. Causes tar files to
 	be excluded from an extract or create. See example below.  Filename
-	globbing does not work for excluded files (yet).
+	globbing works in one of two ways now. See <strong>r</strong> below.
 <p><br><li><strong><strong>b</strong></strong> Blocksize. Must be followed by a valid (greater than
 	zero) blocksize.  Causes tar file to be written out in
 	blocksize*TBLOCK (usually 512 byte) blocks.
@@ -309,6 +309,11 @@ share. The secondary tar flags that can be given to this option are :
 	archive bit set. Useful only with the <strong>c</strong> flag.
 <p><br><li><strong><strong>q</strong></strong> Quiet. Keeps tar from printing diagnostics as it
 	works.  This is the same as tarmode quiet.
+<p><br><li><strong><strong>r</strong></strong> Regular expression include or exclude.  Uses regular 
+	regular expression matching for excluding or excluding files if 
+	compiled with HAVE_REGEX_H. However this mode can be very slow. If 
+	not compiled with HAVE_REGEX_H, does a limited wildcard match on * and 
+	?.
 <p><br><li><strong><strong>N</strong></strong> Newer than. Must be followed by the name of a file
 	whose date is compared against files found on the share during a
 	create. Only files newer than the file specified are backed up to the
diff --git a/docs/manpages/lmhosts.5 b/docs/manpages/lmhosts.5
index b86624f848..534c248415 100644
--- a/docs/manpages/lmhosts.5
+++ b/docs/manpages/lmhosts.5
@@ -76,7 +76,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
@@ -85,7 +85,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+\fIsamba-bugs@samba\&.org\fP\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/make_smbcodepage.1 b/docs/manpages/make_smbcodepage.1
index 36268ffd0c..9c13420107 100644
--- a/docs/manpages/make_smbcodepage.1
+++ b/docs/manpages/make_smbcodepage.1
@@ -61,7 +61,7 @@ provided in the Samba distribution for codepages 437 (USA), 737
 866 (Cyrillic), 932 (Kanji SJIS), 936 (Simplified Chinese), 949
 (Hangul) and 950 (Traditional Chinese)\&. Users are encouraged to write
 text codepage definition files for their own code pages and donate
-them to \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. All codepage files in the
+them to \fIsamba-bugs@samba\&.org\fP\&. All codepage files in the
 Samba \fIsource/codepages\fP directory are compiled and installed when a
 \fI\'make install\'\fP command is issued there\&.
 .PP 
@@ -128,7 +128,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
@@ -137,7 +137,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+\fIsamba-bugs@samba\&.org\fP\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index 507a312029..2c880faa42 100644
--- a/docs/manpages/nmbd.8
+++ b/docs/manpages/nmbd.8
@@ -204,12 +204,12 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 (1)\fP, and the Internet RFC\'s \fBrfc1001\&.txt\fP,
 \fBrfc1002\&.txt\fP\&. In addition the CIFS (formerly SMB) specification is
 available as a link from the Web page :
-http://samba\&.anu\&.edu\&.au/cifs/\&.
+http://samba\&.org/cifs/\&.
 .PP 
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
@@ -218,7 +218,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+\fIsamba-bugs@samba\&.org\fP\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/nmblookup.1 b/docs/manpages/nmblookup.1
index 90b1864409..04f24d0ef5 100644
--- a/docs/manpages/nmblookup.1
+++ b/docs/manpages/nmblookup.1
@@ -115,9 +115,9 @@ which will return all registered names within a broadcast area\&.
 .PP 
 For example, running :
 .PP 
-\f(CWnmblookup -U samba\&.anu\&.edu\&.au -R IRIX#1B\'\fP
+\f(CWnmblookup -U samba\&.org -R IRIX#1B\'\fP
 .PP 
-would query the WINS server samba\&.anu\&.edu\&.au for the domain master
+would query the WINS server samba\&.org for the domain master
 browser (1B name type) for the IRIX workgroup\&.
 .PP 
 .SH "VERSION" 
@@ -132,7 +132,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
@@ -141,7 +141,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+\fIsamba-bugs@samba\&.org\fP\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7
index f48d7aaf3f..96975f34c2 100644
--- a/docs/manpages/samba.7
+++ b/docs/manpages/samba.7
@@ -20,7 +20,7 @@ described in a separate manual page\&. It is strongly recommended that
 you read the documentation that comes with Samba and the manual pages
 of those components that you use\&. If the manual pages aren\'t clear
 enough then please send a patch or bug report
-to \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+to \fIsamba-bugs@samba\&.org\fP\&.
 .PP 
 .IP 
 .IP "\fBsmbd\fP" 
@@ -102,7 +102,7 @@ file COPYING\&. You are encouraged to distribute copies of the Samba
 suite, but please obey the terms of this license\&.
 .PP 
 The latest version of the Samba suite can be obtained via anonymous
-ftp from samba\&.anu\&.edu\&.au in the directory pub/samba/\&. It is
+ftp from samba\&.org in the directory pub/samba/\&. It is
 also available on several mirror sites worldwide\&.
 .PP 
 You may also find useful information about Samba on the newsgroup
@@ -112,7 +112,7 @@ the mailing list are given in the README file that comes with Samba\&.
 If you have access to a WWW viewer (such as Netscape or Mosaic) then
 you will also find lots of useful information, including back issues
 of the Samba mailing list, at
-http://samba\&.anu\&.edu\&.au/samba/\&.
+http://samba\&.org/samba/\&.
 .PP 
 .SH "VERSION" 
 .PP 
@@ -121,13 +121,13 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "CONTRIBUTIONS" 
 .PP 
 If you wish to contribute to the Samba project, then I suggest you
-join the Samba mailing list at \fIsamba@samba\&.anu\&.edu\&.au\fP\&. See the
+join the Samba mailing list at \fIsamba@samba\&.org\fP\&. See the
 Web page at
-http://samba\&.anu\&.edu\&.au/listproc
+http://samba\&.org/listproc
 for details on how to do this\&.
 .PP 
 If you have patches to submit or bugs to report then you may mail them
-directly to \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Note, however, that due to
+directly to \fIsamba-bugs@samba\&.org\fP\&. Note, however, that due to
 the enormous popularity of this package the Samba Team may take some
 time to respond to mail\&. We prefer patches in \fIdiff -u\fP format\&.
 .PP 
@@ -135,21 +135,21 @@ time to respond to mail\&. We prefer patches in \fIdiff -u\fP format\&.
 .PP 
 Contributors to the project are now too numerous to mention here but
 all deserve the thanks of all Samba users\&. To see a full list, look at
-ftp://samba\&.anu\&.edu\&.au/pub/samba/alpha/change-log
+ftp://samba\&.org/pub/samba/alpha/change-log
 for the pre-CVS changes and at
-ftp://samba\&.anu\&.edu\&.au/pub/samba/alpha/cvs\&.log
+ftp://samba\&.org/pub/samba/alpha/cvs\&.log
 for the contributors to Samba post-CVS\&. CVS is the Open Source source
 code control system used by the Samba Team to develop Samba\&. The
 project would have been unmanageable without it\&.
 .PP 
 In addition, several commercial organizations now help fund the Samba
 Team with money and equipment\&. For details see the Samba Web pages at
-http://samba\&.anu\&.edu\&.au/samba/samba-thanks\&.html\&.
+http://samba\&.org/samba/samba-thanks\&.html\&.
 .PP 
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
@@ -158,4 +158,4 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+\fIsamba-bugs@samba\&.org\fP\&.
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index c90f6eb16f..5c89a0ace0 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -3698,15 +3698,6 @@ If you want to silently delete it then try:
 .IP 
 \f(CW"message command = rm %s"\fP\&.
 .IP 
-For the really adventurous, try something like this:
-.IP 
-\f(CWmessage command = csh -c \'csh < %s |& /usr/local/samba/bin/smbclient -M %m; rm %s\' &\fP
-.IP 
-this would execute the command as a script on the server, then give
-them the result in a WinPopup message\&. Note that this could cause a
-loop if you send a message from the server using smbclient! You better
-wrap the above in a script that checks for this :-)
-.IP 
 \fBDefault:\fP
 \f(CW	no message command\fP
 .IP 
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index 6c756ec77d..6d93c3cd51 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -358,13 +358,13 @@ get their creation dates restored properly\&.
 Include files and directories\&. Is the default
 behavior when filenames are specified above\&. Causes tar files to
 be included in an extract or create (and therefore everything else to
-be excluded)\&. See example below\&.  Filename globbing does not work for
-included files for extractions (yet)\&.
+be excluded)\&. See example below\&.  Filename globbing works 
+in one of two ways\&.  See \fBr\fP below\&.
 .IP 
 .IP "\fBX\fP" 
 Exclude files and directories\&. Causes tar files to
 be excluded from an extract or create\&. See example below\&.  Filename
-globbing does not work for excluded files (yet)\&.
+globbing works in one of two ways now\&. See \fBr\fP below\&.
 .IP 
 .IP "\fBb\fP" 
 Blocksize\&. Must be followed by a valid (greater than
@@ -379,6 +379,13 @@ archive bit set\&. Useful only with the \fBc\fP flag\&.
 Quiet\&. Keeps tar from printing diagnostics as it
 works\&.  This is the same as tarmode quiet\&.
 .IP 
+.IP "\fBr\fP" 
+Regular expression include or exclude\&.  Uses regular 
+regular expression matching for excluding or excluding files if 
+compiled with HAVE_REGEX_H\&. However this mode can be very slow\&. If 
+not compiled with HAVE_REGEX_H, does a limited wildcard match on * and 
+?\&.
+.IP 
 .IP "\fBN\fP" 
 Newer than\&. Must be followed by the name of a file
 whose date is compared against files found on the share during a
@@ -751,7 +758,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
@@ -760,7 +767,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+\fIsamba-bugs@samba\&.org\fP\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index e2f68fb0d2..7088cfd557 100644
--- a/docs/manpages/smbd.8
+++ b/docs/manpages/smbd.8
@@ -415,12 +415,12 @@ performance\&.
 \fBtestprns (1)\fP, and the Internet RFC\'s
 \fBrfc1001\&.txt\fP, \fBrfc1002\&.txt\fP\&. In addition the CIFS (formerly SMB)
 specification is available as a link from the Web page :
-http://samba\&.anu\&.edu\&.au/cifs/\&.
+http://samba\&.org/cifs/\&.
 .PP 
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
@@ -429,7 +429,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+\fIsamba-bugs@samba\&.org\fP\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full list of contributors
 and details on how to submit bug reports, comments etc\&.
diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5
index 5d49d34e4a..e3fbcf161e 100644
--- a/docs/manpages/smbpasswd.5
+++ b/docs/manpages/smbpasswd.5
@@ -198,7 +198,7 @@ algorithm\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
@@ -207,7 +207,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP) 
 and updated for the Samba2\&.0 release by Jeremy
-Allison, \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+Allison, \fIsamba-bugs@samba\&.org\fP\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8
index 22237b4210..ad502e01b1 100644
--- a/docs/manpages/smbpasswd.8
+++ b/docs/manpages/smbpasswd.8
@@ -199,7 +199,7 @@ being used as an NT Primary Domain Controller\&. PDC support is not a
 supported feature in Samba2\&.0 but will become supported in a later
 release\&. If you wish to know more about using Samba as an NT PDC then
 please subscribe to the mailing list
-\fIsamba-ntdom@samba\&.anu\&.edu\&.au\fP\&.
+\fIsamba-ntdom@samba\&.org\fP\&.
 .IP 
 This option is only available when running \fBsmbpasswd\fP as root\&.
 .IP 
@@ -285,7 +285,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .IP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .IP 
@@ -294,7 +294,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+\fIsamba-bugs@samba\&.org\fP\&.
 .IP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/smbrun.1 b/docs/manpages/smbrun.1
index 78e2213cc6..d34b408d6b 100644
--- a/docs/manpages/smbrun.1
+++ b/docs/manpages/smbrun.1
@@ -53,7 +53,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
@@ -62,7 +62,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+\fIsamba-bugs@samba\&.org\fP\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1
index eae5f594b3..ddbbc7e8a5 100644
--- a/docs/manpages/smbstatus.1
+++ b/docs/manpages/smbstatus.1
@@ -55,7 +55,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
@@ -64,7 +64,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+\fIsamba-bugs@samba\&.org\fP\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1
index 88bc88d08a..2aaa542231 100644
--- a/docs/manpages/smbtar.1
+++ b/docs/manpages/smbtar.1
@@ -105,7 +105,7 @@ the \fBsmbclient\fP command\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
@@ -117,7 +117,7 @@ etc\&. The man page sources were converted to YODL format (another
 excellent piece of Open Source software available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison,
-\fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+\fIsamba-bugs@samba\&.org\fP\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/swat.8 b/docs/manpages/swat.8
index 5ab76fa504..a9e876aaf2 100644
--- a/docs/manpages/swat.8
+++ b/docs/manpages/swat.8
@@ -137,7 +137,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell (samba-bugs@samba\&.anu\&.edu\&.au)\&. Samba is now developed
+Andrew Tridgell (samba-bugs@samba\&.org)\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
@@ -146,7 +146,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+\fIsamba-bugs@samba\&.org\fP\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1
index 725b5863b6..b75590aa9a 100644
--- a/docs/manpages/testparm.1
+++ b/docs/manpages/testparm.1
@@ -76,7 +76,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
@@ -85,7 +85,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+\fIsamba-bugs@samba\&.org\fP\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/testprns.1 b/docs/manpages/testprns.1
index 9be0443344..bb366e329c 100644
--- a/docs/manpages/testprns.1
+++ b/docs/manpages/testprns.1
@@ -71,7 +71,7 @@ Other messages are self-explanatory\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&. Samba is now developed
+Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed\&.
 .PP 
@@ -80,7 +80,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.anu\&.edu\&.au\fP\&.
+\fIsamba-bugs@samba\&.org\fP\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,