global change from samba.anu.edu.au to samba.org

(This used to be commit 42d2509c9fab5c774fd33b9d4b5bd1ee125479c3)

73 files changed, 383 insertions, 383 deletions

diff --git a/docs/THANKS b/docs/THANKS
index 19c11dc432..789042f78e 100644
--- a/docs/THANKS
+++ b/docs/THANKS
@@ -46,7 +46,7 @@ Isaac Heizer (isaache@microsoft.com)
     Samba browser code.
 
     Paul was responsible for Microsoft paying my flight to Seattle for the
-    first CIFS conference (see http://samba.anu.edu.au/cifs) and has been
+    first CIFS conference (see http://samba.org/cifs) and has been
     generally helpful and cooperative as the SMB community moves towards
     an Internet-ready specification. Isaac has regularly provided help on
     the behaviour of NT networks.
diff --git a/docs/announce b/docs/announce
index 7bc0aa8c4c..39697bcb57 100644
--- a/docs/announce
+++ b/docs/announce
@@ -106,7 +106,7 @@ on who did what bits.
 Where can I get it?
 -------------------
 
-The package is available via anonymous ftp from samba.anu.edu.au in
+The package is available via anonymous ftp from samba.org in
 the directory pub/samba/. 
 
 What about SMBServer?
@@ -136,7 +136,7 @@ There is also often quite a bit of discussion about Samba on the
 newsgroup comp.protocols.smb.
 
 A WWW site with lots of Samba info can be found at 
-http://samba.anu.edu.au/samba/
+http://samba.org/samba/
 
-The Samba Team (Contact: samba-bugs@samba.anu.edu.au)
+The Samba Team (Contact: samba-bugs@samba.org)
 June 1996
diff --git a/docs/faq/Samba-Server-FAQ-2.html b/docs/faq/Samba-Server-FAQ-2.html
index 731391a998..9b96159f8f 100644
--- a/docs/faq/Samba-Server-FAQ-2.html
+++ b/docs/faq/Samba-Server-FAQ-2.html
@@ -197,7 +197,7 @@ such as <F>....</F></P>
 <A NAME="no_browse"></A> 
 
 See 
-<A HREF="ftp://samba.anu.edu.au/pub/samba/BROWSING.txt">BROWSING.txt</A>
+<A HREF="ftp://samba.org/pub/samba/BROWSING.txt">BROWSING.txt</A>
 for more information on browsing.  Browsing.txt can also be found
 in the docs directory of the Samba source.</P>
 <P>If your GUI client does not permit you to select non-browsable
diff --git a/docs/faq/Samba-Server-FAQ.html b/docs/faq/Samba-Server-FAQ.html
index eadc3e26ed..3ad44cfe7e 100644
--- a/docs/faq/Samba-Server-FAQ.html
+++ b/docs/faq/Samba-Server-FAQ.html
@@ -39,7 +39,7 @@ Table of Contents
 <HR>
 <H1> Samba Server FAQ</H1>
 
-<H2>Dan Shearer & Paul Blackman, <CODE>ictinus@samba.anu.edu.au</CODE></H2>v 0.3, 7 Oct '97
+<H2>Dan Shearer & Paul Blackman, <CODE>ictinus@samba.org</CODE></H2>v 0.3, 7 Oct '97
 <P><HR><EM> This is the <EM>Server</EM> Frequently Asked Questions (FAQ)
 document for Samba, the free and very popular SMB and CIFS server
 product. A general 
diff --git a/docs/faq/Samba-Server-FAQ.sgml b/docs/faq/Samba-Server-FAQ.sgml
index 020d532281..6a53fc0680 100644
--- a/docs/faq/Samba-Server-FAQ.sgml
+++ b/docs/faq/Samba-Server-FAQ.sgml
@@ -11,7 +11,7 @@
 
 <title> Samba Server FAQ
 
-<author>Dan Shearer & Paul Blackman, <tt>ictinus@samba.anu.edu.au</tt>
+<author>Dan Shearer & Paul Blackman, <tt>ictinus@samba.org</tt>
 
 <date>v 0.3, 7 Oct '97
 
@@ -256,7 +256,7 @@ Samba compiled with libdes - enabling encrypted passwords
 <sect1>Managing Samba Log files<p><label id="LogFiles">
 
 <sect1>I can't see the Samba server in any browse lists!<p><label id="no_browse">
- See <url url="ftp://samba.anu.edu.au/pub/samba/BROWSING.txt" name="BROWSING.txt">
+ See <url url="ftp://samba.org/pub/samba/BROWSING.txt" name="BROWSING.txt">
  for more information on browsing.  Browsing.txt can also be found
  in the docs directory of the Samba source.
 
diff --git a/docs/faq/Samba-meta-FAQ-1.html b/docs/faq/Samba-meta-FAQ-1.html
index 80610fb59e..7258a32f1e 100644
--- a/docs/faq/Samba-meta-FAQ-1.html
+++ b/docs/faq/Samba-meta-FAQ-1.html
@@ -119,7 +119,7 @@ all covered either in this document or in those it refers to.</P>
 <UL>
 <LI> Meta-FAQ. This is the mother of all documents, and is the one you
 are reading now. The latest version is always at 
-<A HREF="http://samba.anu.edu.au/[.....]">http://samba.anu.edu.au/[.....]</A> but there is probably a much
+<A HREF="http://samba.org/[.....]">http://samba.org/[.....]</A> but there is probably a much
 nearer 
 <A HREF="../MIRRORS">mirror site</A> which you should use
 instead.
diff --git a/docs/faq/Samba-meta-FAQ-2.html b/docs/faq/Samba-meta-FAQ-2.html
index ac76038006..87cf815e0b 100644
--- a/docs/faq/Samba-meta-FAQ-2.html
+++ b/docs/faq/Samba-meta-FAQ-2.html
@@ -63,7 +63,7 @@ and this FAQ were originally written by Karl Auer.</P>
 </P>
 <P>At time of writing, the current version was 1.9.17. If you want to be
 sure check the bottom of the change-log file. 
-<A HREF="ftp://samba.anu.edu.au/pub/samba/alpha/change-log">ftp://samba.anu.edu.au/pub/samba/alpha/change-log</A></P>
+<A HREF="ftp://samba.org/pub/samba/alpha/change-log">ftp://samba.org/pub/samba/alpha/change-log</A></P>
 <P>For more information see 
 <A HREF="#version_nums">What do the version numbers mean?</A></P>
 
@@ -73,7 +73,7 @@ sure check the bottom of the change-log file.
 <P>
 <A NAME="WhereFrom"></A> 
 </P>
-<P>The Samba suite is available via anonymous ftp from samba.anu.edu.au and
+<P>The Samba suite is available via anonymous ftp from samba.org and
 many 
 <A HREF="../MIRRORS">mirror</A> sites. You will get much
 faster performance if you use a mirror site. The latest and greatest
@@ -166,7 +166,7 @@ See below for subscription information.
 discussion about Samba. 
 </LI>
 <LI>The WWW site 'SAMBA Web Pages' at 
-<A HREF="http://samba.anu.edu.au/samba/">http://samba.anu.edu.au/samba/</A> includes:
+<A HREF="http://samba.org/samba/">http://samba.org/samba/</A> includes:
 
 <UL>
 <LI>Links to man pages and documentation, including this FAQ</LI>
@@ -187,7 +187,7 @@ discussion about Samba.
 <A NAME="mailinglist"></A> 
 </P>
 <P>Send email to 
-<A HREF="mailto:listproc@samba.anu.edu.au">listproc@samba.anu.edu.au</A>. Make sure the subject line is blank,
+<A HREF="mailto:listproc@samba.org">listproc@samba.org</A>. Make sure the subject line is blank,
 and include the following two lines in the body of the message:</P>
 <P>
 <BLOCKQUOTE><CODE>
@@ -205,7 +205,7 @@ single message containing all the messages that have been received by
 the list since the last time and sends a copy of this message to all
 subscribers. There are thousands of people on this list.</P>
 <P>If you stop being interested in Samba, please send another email to
-<A HREF="mailto:listproc@samba.anu.edu.au">listproc@samba.anu.edu.au</A>. Make sure the subject line is blank, and
+<A HREF="mailto:listproc@samba.org">listproc@samba.org</A>. Make sure the subject line is blank, and
 include the following two lines in the body of the message:</P>
 <P>
 <BLOCKQUOTE><CODE>
@@ -232,7 +232,7 @@ carried out the first three steps given here!</P>
 <OL>
 <LI> See if there are any likely looking entries in this FAQ!
 If you have just installed Samba, have you run through the checklist in
-<A HREF="ftp://samba.anu.edu.au/pub/samba/DIAGNOSIS.txt">DIAGNOSIS.txt</A>? It can save you a lot of time and effort.
+<A HREF="ftp://samba.org/pub/samba/DIAGNOSIS.txt">DIAGNOSIS.txt</A>? It can save you a lot of time and effort.
 DIAGNOSIS.txt can also be found in the docs directory of the Samba
 distribution.
 </LI>
@@ -269,7 +269,7 @@ that an explanation can be incorporated into the next version.</P>
 so that everyone else gets the benefit of your work. This is one of
 the most important aspects to the maintainence of Samba. Send all
 patches to 
-<A HREF="mailto:samba-bugs@samba.anu.edu.au">samba-bugs@samba.anu.edu.au</A>. Do not send patches to Andrew Tridgell or any
+<A HREF="mailto:samba-bugs@samba.org">samba-bugs@samba.org</A>. Do not send patches to Andrew Tridgell or any
 other individual, they may be lost if you do.</P>
 <P>Patch format
 ------------</P>
@@ -321,7 +321,7 @@ huge files.
 
 <P>If you have spotted something very serious and believe that it is
 important to contact the developers quickly send a message to
-samba-urgent@samba.anu.edu.au. This will be processed more quickly than
+samba-urgent@samba.org. This will be processed more quickly than
 mail to samba-bugs. Please think carefully before using this address. An
 example of its use might be to report a security hole.</P>
 <P>Examples of things <EM>not</EM> to send to samba-urgent include problems
diff --git a/docs/faq/Samba-meta-FAQ-3.html b/docs/faq/Samba-meta-FAQ-3.html
index 63adff35f9..8ebb38a334 100644
--- a/docs/faq/Samba-meta-FAQ-3.html
+++ b/docs/faq/Samba-meta-FAQ-3.html
@@ -54,7 +54,7 @@ protocol specification is in the public domain and ongoing discussions
 concerning the spec take place on a public mailing list according to the
 rules of the Internet Engineering Task Force. For more information and
 pointers see 
-<A HREF="http://samba.anu.edu.au/cifs/">http://samba.anu.edu.au/cifs/</A></P>
+<A HREF="http://samba.org/cifs/">http://samba.org/cifs/</A></P>
 <P>The following is taken from 
 <A HREF="http://www.microsoft.com/intdev/cifs/">http://www.microsoft.com/intdev/cifs/</A></P>
 <P>
diff --git a/docs/faq/Samba-meta-FAQ.html b/docs/faq/Samba-meta-FAQ.html
index 5a70808867..38f094bf33 100644
--- a/docs/faq/Samba-meta-FAQ.html
+++ b/docs/faq/Samba-meta-FAQ.html
@@ -37,7 +37,7 @@ Table of Contents
 <HR>
 <H1> Samba meta FAQ</H1>
 
-<H2>Dan Shearer & Paul Blackman, <CODE>ictinus@samba.anu.edu.au</CODE></H2>v 0.3, 7 Oct '97
+<H2>Dan Shearer & Paul Blackman, <CODE>ictinus@samba.org</CODE></H2>v 0.3, 7 Oct '97
 <P><HR><EM> This is the meta-Frequently Asked Questions (FAQ) document
 for Samba, the free and very popular SMB and CIFS server product. It
 contains overview information for the Samba suite of programs, a
diff --git a/docs/faq/Samba-meta-FAQ.sgml b/docs/faq/Samba-meta-FAQ.sgml
index 75038f19f5..79b587a49f 100644
--- a/docs/faq/Samba-meta-FAQ.sgml
+++ b/docs/faq/Samba-meta-FAQ.sgml
@@ -11,7 +11,7 @@
 
 <title> Samba meta FAQ
 
-<author>Dan Shearer & Paul Blackman, <tt>ictinus@samba.anu.edu.au</tt>
+<author>Dan Shearer & Paul Blackman, <tt>ictinus@samba.org</tt>
 
 <date>v 0.3, 7 Oct '97
 
@@ -113,7 +113,7 @@ all covered either in this document or in those it refers to.
 
 <item> Meta-FAQ. This is the mother of all documents, and is the one you
 are reading now. The latest version is always at <url
-url="http://samba.anu.edu.au/[.....]"> but there is probably a much
+url="http://samba.org/[.....]"> but there is probably a much
 nearer <url url="../MIRRORS" name="mirror site"> which you should use
 instead.
 
@@ -189,13 +189,13 @@ and this FAQ were originally written by Karl Auer.
 <sect1> What is the current version of Samba?<p><label id="current_version">
 
 At time of writing, the current version was 1.9.17. If you want to be
-sure check the bottom of the change-log file. <url url="ftp://samba.anu.edu.au/pub/samba/alpha/change-log">
+sure check the bottom of the change-log file. <url url="ftp://samba.org/pub/samba/alpha/change-log">
 
 For more information see <ref id="version_nums" name="What do the version numbers mean?">
 
 <sect1> Where can I get it? <p><label id="WhereFrom">
 
-The Samba suite is available via anonymous ftp from samba.anu.edu.au and
+The Samba suite is available via anonymous ftp from samba.org and
 many <url url="../MIRRORS" name="mirror"> sites. You will get much
 faster performance if you use a mirror site. The latest and greatest
 versions of the suite are in the directory:
@@ -288,7 +288,7 @@ See below for subscription information.
 discussion about Samba. 
 
 <item>The WWW site 'SAMBA Web Pages' at <url
-url="http://samba.anu.edu.au/samba/"> includes:
+url="http://samba.org/samba/"> includes:
 
   <itemize>
     <item>Links to man pages and documentation, including this FAQ
@@ -302,8 +302,8 @@ url="http://samba.anu.edu.au/samba/"> includes:
 
 <sect1>How do I subscribe to the Samba Mailing Lists?<p><label id="mailinglist">
 
-Send email to <htmlurl url="mailto:listproc@samba.anu.edu.au"
-name="listproc@samba.anu.edu.au">. Make sure the subject line is blank,
+Send email to <htmlurl url="mailto:listproc@samba.org"
+name="listproc@samba.org">. Make sure the subject line is blank,
 and include the following two lines in the body of the message:
 
 <tscreen><verb>
@@ -321,7 +321,7 @@ the list since the last time and sends a copy of this message to all
 subscribers. There are thousands of people on this list.
 
 If you stop being interested in Samba, please send another email to
-<htmlurl url="mailto:listproc@samba.anu.edu.au" name="listproc@samba.anu.edu.au">. Make sure the subject line is blank, and
+<htmlurl url="mailto:listproc@samba.org" name="listproc@samba.org">. Make sure the subject line is blank, and
 include the following two lines in the body of the message:
 
 <tscreen><verb>
@@ -342,7 +342,7 @@ carried out the first three steps given here!
 
 <enum> <item> See if there are any likely looking entries in this FAQ!
 If you have just installed Samba, have you run through the checklist in
-<url url="ftp://samba.anu.edu.au/pub/samba/DIAGNOSIS.txt"
+<url url="ftp://samba.org/pub/samba/DIAGNOSIS.txt"
 name="DIAGNOSIS.txt">? It can save you a lot of time and effort.
 DIAGNOSIS.txt can also be found in the docs directory of the Samba
 distribution.
@@ -378,7 +378,7 @@ that an explanation can be incorporated into the next version.
 If you make changes to the source code, <em>please</em> submit these patches
 so that everyone else gets the benefit of your work. This is one of
 the most important aspects to the maintainence of Samba. Send all
-patches to <htmlurl url="mailto:samba-bugs@samba.anu.edu.au" name="samba-bugs@samba.anu.edu.au">. Do not send patches to Andrew Tridgell or any
+patches to <htmlurl url="mailto:samba-bugs@samba.org" name="samba-bugs@samba.org">. Do not send patches to Andrew Tridgell or any
 other individual, they may be lost if you do.
 
 Patch format
@@ -440,7 +440,7 @@ Some extras :
 
 If you have spotted something very serious and believe that it is
 important to contact the developers quickly send a message to
-samba-urgent@samba.anu.edu.au. This will be processed more quickly than
+samba-urgent@samba.org. This will be processed more quickly than
 mail to samba-bugs. Please think carefully before using this address. An
 example of its use might be to report a security hole.
 
@@ -526,7 +526,7 @@ Internet standard and is a very long way from becoming one, BUT the
 protocol specification is in the public domain and ongoing discussions
 concerning the spec take place on a public mailing list according to the
 rules of the Internet Engineering Task Force. For more information and
-pointers see <url url="http://samba.anu.edu.au/cifs/">
+pointers see <url url="http://samba.org/cifs/">
 
 The following is taken from <url url="http://www.microsoft.com/intdev/cifs/">
 
diff --git a/docs/faq/Samba-meta-FAQ.txt b/docs/faq/Samba-meta-FAQ.txt
index 65d9a57ff6..fb4887e097 100644
--- a/docs/faq/Samba-meta-FAQ.txt
+++ b/docs/faq/Samba-meta-FAQ.txt
@@ -1,5 +1,5 @@
   Samba meta FAQ
-  Dan Shearer & Paul Blackman, ictinus@samba.anu.edu.au
+  Dan Shearer & Paul Blackman, ictinus@samba.org
   v 0.3, 7 Oct '97
 
   This is the meta-Frequently Asked Questions (FAQ) document for Samba,
@@ -182,7 +182,7 @@
 
   +o  Meta-FAQ. This is the mother of all documents, and is the one you
      are reading now. The latest version is always at
-     <http://samba.anu.edu.au/[.....]> but there is probably a much
+     <http://samba.org/[.....]> but there is probably a much
      nearer mirror site <../MIRRORS> which you should use instead.
 
   +o  <Samba-Server-FAQ.html> is the best starting point for information
@@ -261,14 +261,14 @@
 
   At time of writing, the current version was 1.9.17. If you want to be
   sure check the bottom of the change-log file.
-  <ftp://samba.anu.edu.au/pub/samba/alpha/change-log>
+  <ftp://samba.org/pub/samba/alpha/change-log>
   For more information see ``What do the version numbers mean?''
 
 
   22..33..  WWhheerree ccaann II ggeett iitt??
 
 
-  The Samba suite is available via anonymous ftp from samba.anu.edu.au
+  The Samba suite is available via anonymous ftp from samba.org
   and many mirror <../MIRRORS> sites. You will get much faster
   performance if you use a mirror site. The latest and greatest versions
   of the suite are in the directory:
@@ -362,7 +362,7 @@
   +o  The newsgroup comp.protocols.smb, which has a great deal of
      discussion about Samba.
 
-  +o  The WWW site 'SAMBA Web Pages' at  <http://samba.anu.edu.au/samba/>
+  +o  The WWW site 'SAMBA Web Pages' at  <http://samba.org/samba/>
      includes:
 
 
@@ -381,7 +381,7 @@
   22..66..  HHooww ddoo II ssuubbssccrriibbee ttoo tthhee SSaammbbaa MMaaiilliinngg LLiissttss??
 
 
-  Send email to listproc@samba.anu.edu.au. Make sure the subject line is
+  Send email to listproc@samba.org. Make sure the subject line is
   blank, and include the following two lines in the body of the message:
 
 
@@ -402,7 +402,7 @@
   subscribers. There are thousands of people on this list.
 
   If you stop being interested in Samba, please send another email to
-  listproc@samba.anu.edu.au. Make sure the subject line is blank, and
+  listproc@samba.org. Make sure the subject line is blank, and
   include the following two lines in the body of the message:
 
 
@@ -429,7 +429,7 @@
 
   1. See if there are any likely looking entries in this FAQ!  If you
      have just installed Samba, have you run through the checklist in
-     DIAGNOSIS.txt <ftp://samba.anu.edu.au/pub/samba/DIAGNOSIS.txt>? It
+     DIAGNOSIS.txt <ftp://samba.org/pub/samba/DIAGNOSIS.txt>? It
      can save you a lot of time and effort.  DIAGNOSIS.txt can also be
      found in the docs directory of the Samba distribution.
 
@@ -466,7 +466,7 @@
   If you make changes to the source code, _p_l_e_a_s_e submit these patches so
   that everyone else gets the benefit of your work. This is one of the
   most important aspects to the maintainence of Samba. Send all patches
-  to samba-bugs@samba.anu.edu.au. Do not send patches to Andrew Tridgell
+  to samba-bugs@samba.org. Do not send patches to Andrew Tridgell
   or any other individual, they may be lost if you do.
 
   Patch format ------------
@@ -518,7 +518,7 @@
 
   If you have spotted something very serious and believe that it is
   important to contact the developers quickly send a message to samba-
-  urgent@samba.anu.edu.au. This will be processed more quickly than mail
+  urgent@samba.org. This will be processed more quickly than mail
   to samba-bugs. Please think carefully before using this address. An
   example of its use might be to report a security hole.
 
@@ -614,7 +614,7 @@
   protocol specification is in the public domain and ongoing discussions
   concerning the spec take place on a public mailing list according to
   the rules of the Internet Engineering Task Force. For more information
-  and pointers see  <http://samba.anu.edu.au/cifs/>
+  and pointers see  <http://samba.org/cifs/>
 
   The following is taken from  <http://www.microsoft.com/intdev/cifs/>
 
diff --git a/docs/faq/sambafaq-1.html b/docs/faq/sambafaq-1.html
index c010e50e01..d91ea24f2e 100644
--- a/docs/faq/sambafaq-1.html
+++ b/docs/faq/sambafaq-1.html
@@ -61,7 +61,7 @@ and this FAQ were originally written by Karl Auer.</P>
 
 At time of writing, the current version was 1.9.17. If you want to be
 sure check the bottom of the change-log file. 
-<A HREF="ftp://samba.anu.edu.au/pub/samba/alpha/change-log">ftp://samba.anu.edu.au/pub/samba/alpha/change-log</A></P>
+<A HREF="ftp://samba.org/pub/samba/alpha/change-log">ftp://samba.org/pub/samba/alpha/change-log</A></P>
 <P>For more information see 
 <A HREF="#version_nums">What do the version numbers mean?</A></P>
 
@@ -72,7 +72,7 @@ sure check the bottom of the change-log file.
 <A NAME="where"></A> 
 
 The Samba suite is available via anonymous ftp from
-samba.anu.edu.au. The latest and greatest versions of the suite are in
+samba.org. The latest and greatest versions of the suite are in
 the directory:</P>
 <P>/pub/samba/</P>
 <P>Development (read "alpha") versions, which are NOT necessarily stable
@@ -206,78 +206,78 @@ There are a number of places to look for more information on Samba, including:
 </UL>
 </LI>
 <LI>The long list of topic documentation.  These files can be found in the 'docs' directory of the Samba source, or at 
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/">ftp://samba.anu.edu.au/pub/samba/docs/</A>
+<A HREF="ftp://samba.org/pub/samba/docs/">ftp://samba.org/pub/samba/docs/</A>
 <UL>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/Application_Serving.txt">Application_Serving.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/Application_Serving.txt">Application_Serving.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt">BROWSING.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/BROWSING.txt">BROWSING.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/BUGS.txt">BUGS.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/BUGS.txt">BUGS.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/DIAGNOSIS.txt">DIAGNOSIS.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/DIAGNOSIS.txt">DIAGNOSIS.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/DNIX.txt">DNIX.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/DNIX.txt">DNIX.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/DOMAIN.txt">DOMAIN.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/DOMAIN.txt">DOMAIN.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/DOMAIN_CONTROL.txt">CONTROL.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/DOMAIN_CONTROL.txt">CONTROL.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/ENCRYPTION.txt">ENCRYPTION.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/ENCRYPTION.txt">ENCRYPTION.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/Faxing.txt">Faxing.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/Faxing.txt">Faxing.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/GOTCHAS.txt">GOTCHAS.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/GOTCHAS.txt">GOTCHAS.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/HINTS.txt">HINTS.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/HINTS.txt">HINTS.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/INSTALL.sambatar">INSTALL.sambatar</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/INSTALL.sambatar">INSTALL.sambatar</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/INSTALL.txt">INSTALL.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/INSTALL.txt">INSTALL.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/MIRRORS">MIRRORS</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/MIRRORS">MIRRORS</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/NetBIOS.txt">NetBIOS.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/NetBIOS.txt">NetBIOS.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/OS2.txt">OS2.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/OS2.txt">OS2.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/PROJECTS">PROJECTS</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/PROJECTS">PROJECTS</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/Passwords.txt">Passwords.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/Passwords.txt">Passwords.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/Printing.txt">Printing.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/Printing.txt">Printing.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/README.DCEDFS">README.DCEDFS</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/README.DCEDFS">README.DCEDFS</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/README.OS2">README.OS2</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/README.OS2">README.OS2</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/README.jis">README.jis</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/README.jis">README.jis</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/README.sambatar">README.sambatar</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/README.sambatar">README.sambatar</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/SCO.txt">SCO.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/SCO.txt">SCO.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/SMBTAR.notes">SMBTAR.notes</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/SMBTAR.notes">SMBTAR.notes</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/Speed.txt">Speed.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/Speed.txt">Speed.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/Support.txt">Support.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/Support.txt">Support.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/THANKS">THANKS</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/THANKS">THANKS</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/Tracing.txt">Tracing.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/Tracing.txt">Tracing.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/UNIX-SMB.txt">SMB.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/UNIX-SMB.txt">SMB.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/Warp.txt">Warp.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/Warp.txt">Warp.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/WinNT.txt">WinNT.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/WinNT.txt">WinNT.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/history">history</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/history">history</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/security_level.txt">level.txt</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/security_level.txt">level.txt</A></LI>
 <LI>
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/wfw_slip.htm">slip.htm</A></LI>
+<A HREF="ftp://samba.org/pub/samba/docs/wfw_slip.htm">slip.htm</A></LI>
 </UL>
 </LI>
 </UL>
@@ -290,7 +290,7 @@ There are a number of places to look for more information on Samba, including:
 <A NAME="mailinglist"></A> 
 
 Send email to 
-<A HREF="mailto:listproc@samba.anu.edu.au">listproc@samba.anu.edu.au</A>. Make sure the subject line is
+<A HREF="mailto:listproc@samba.org">listproc@samba.org</A>. Make sure the subject line is
 blank, and include the following two lines in the body of the message:
 <BLOCKQUOTE><CODE>
 <PRE>
@@ -307,7 +307,7 @@ regurgitates a single message containing all the messages that have
 been received by the list since the last time and sends a copy of this
 message to all subscribers.</P>
 <P>If you stop being interested in Samba, please send another email to
-<A HREF="mailto:listproc@samba.anu.edu.au">listproc@samba.anu.edu.au</A>. Make sure the subject line is blank, and
+<A HREF="mailto:listproc@samba.org">listproc@samba.org</A>. Make sure the subject line is blank, and
 include the following two lines in the body of the message:
 <BLOCKQUOTE><CODE>
 <PRE>
@@ -330,7 +330,7 @@ you subscribed.</P>
 carried out the first three steps given here!</P>
 <P>Firstly, see if there are any likely looking entries in this FAQ! If
 you have just installed Samba, have you run through the checklist in
-<A HREF="ftp://samba.anu.edu.au/pub/samba/DIAGNOSIS.txt">DIAGNOSIS.txt</A>? It can save you a lot of time and effort.
+<A HREF="ftp://samba.org/pub/samba/DIAGNOSIS.txt">DIAGNOSIS.txt</A>? It can save you a lot of time and effort.
 DIAGNOSIS.txt can also be found in the docs directory of the Samba distribution.</P>
 <P>Secondly, read the man pages for smbd, nmbd and smb.conf, looking for
 topics that relate to what you are trying to do.</P>
@@ -353,7 +353,7 @@ I can incorporate it in the next version.</P>
 so that everyone else gets the benefit of your work. This is one of
 the most important aspects to the maintainence of Samba. Send all
 patches to 
-<A HREF="mailto:samba-bugs@samba.anu.edu.au">samba-bugs@samba.anu.edu.au</A>. Do not send patches to Andrew Tridgell or any
+<A HREF="mailto:samba-bugs@samba.org">samba-bugs@samba.org</A>. Do not send patches to Andrew Tridgell or any
 other individual, they may be lost if you do.</P>
 
 
diff --git a/docs/faq/sambafaq-2.html b/docs/faq/sambafaq-2.html
index b92a1e2fcd..dfababb66a 100644
--- a/docs/faq/sambafaq-2.html
+++ b/docs/faq/sambafaq-2.html
@@ -19,7 +19,7 @@
 <A NAME="no_browse"></A> 
 
 See 
-<A HREF="ftp://samba.anu.edu.au/pub/samba/BROWSING.txt">BROWSING.txt</A>
+<A HREF="ftp://samba.org/pub/samba/BROWSING.txt">BROWSING.txt</A>
 for more information on browsing.  Browsing.txt can also be found
 in the docs directory of the Samba source.</P>
 <P>If your GUI client does not permit you to select non-browsable
@@ -121,7 +121,7 @@ network" doesn't fit well with clients possibly running on multiuser
 machines (such as users of smbclient under Unix). Having said that,
 several developers are working hard on building it in to the next
 major version of Samba. If you can contribute, send a message to
-<A HREF="mailto:samba-bugs@samba.anu.edu.au">samba-bugs@samba.anu.edu.au</A> !</P>
+<A HREF="mailto:samba-bugs@samba.org">samba-bugs@samba.org</A> !</P>
 <P>Seeing this message should not affect your ability to mount redirected
 disks and printers, which is really what all this is about.</P>
 <P>For many clients (including Windows for Workgroups and Lan Manager),
@@ -171,7 +171,7 @@ as a strictly temporary solution.</P>
 latest Microsoft products, particularly Excel 5 and Word for Windows
 6. These should have all been solved. If not then please let Andrew
 Tridgell know via email at 
-<A HREF="mailto:samba-bugs@samba.anu.edu.au">samba-bugs@samba.anu.edu.au</A>.</P>
+<A HREF="mailto:samba-bugs@samba.org">samba-bugs@samba.org</A>.</P>
 
 
 <H2><A NAME="ss2.9">2.9 My "server string" doesn't seem to be recognised</A></H2>
diff --git a/docs/faq/sambafaq-3.html b/docs/faq/sambafaq-3.html
index 1b5dcf4d9a..995738bb53 100644
--- a/docs/faq/sambafaq-3.html
+++ b/docs/faq/sambafaq-3.html
@@ -76,7 +76,7 @@ To syncronize your PC's clock with your Samba server:
 <UL>
 <LI> Copy timesync.pif to your windows directory</LI>
 <LI> timesync.pif can be found at:
-<A HREF="http://samba.anu.edu.au/samba/binaries/miscellaneous/timesync.pif">http://samba.anu.edu.au/samba/binaries/miscellaneous/timesync.pif</A></LI>
+<A HREF="http://samba.org/samba/binaries/miscellaneous/timesync.pif">http://samba.org/samba/binaries/miscellaneous/timesync.pif</A></LI>
 <LI> Add timesync.pif to your 'Start Up' group/folder</LI>
 <LI> Open the properties dialog box for the program/icon</LI>
 <LI> Make sure the 'Run Minimized' option is set in program 'Properties'</LI>
@@ -88,7 +88,7 @@ Each time you start your computer (or login for Win95) your PC will
 synchronize its clock with your Samba server.</P>
 <P>Alternativley, if you clients support Domain Logons, you can setup Domain Logons with Samba
 - see: 
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt">BROWSING.txt</A> *** for more information.</P>
+<A HREF="ftp://samba.org/pub/samba/docs/BROWSING.txt">BROWSING.txt</A> *** for more information.</P>
 <P>Then add 
 <BLOCKQUOTE><CODE>
 <PRE>
@@ -122,7 +122,7 @@ over this connection. This is unfortunate, but not fatal.</P>
 (the default) then things will definately break as described
 above. The share level SMB security model has no provision for
 multiple user IDs on the one SMB connection. See 
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/security_level.txt">security_level.txt</A> in
+<A HREF="ftp://samba.org/pub/samba/docs/security_level.txt">security_level.txt</A> in
 the docs for more info on share/user/server level security.</P>
 <P>If you run in user or server level security then you have a chance,
 but only if you have a recent version of Samba (at least 1.9.15p6). In
@@ -292,7 +292,7 @@ in that dialog box.</P>
 
 this is effectively what older versions of Samba did, so if that
 worked for you then give it a go. If this does work then let us know via 
-<A HREF="mailto:samba-bugs@samba.anu.edu.au">samba-bugs@samba.anu.edu.au</A>,
+<A HREF="mailto:samba-bugs@samba.org">samba-bugs@samba.org</A>,
 and we'll make it the default. Currently the default is a 0 length
 string.</P>
 
@@ -307,7 +307,7 @@ passing clear text passwords over the network.  To enable access to
 Samba shares from NT 4.0 SP3, you must do <B>ONE</B> of two things:
 <OL>
 <LI> Set the Samba configuration option 'security = user' and implement all of the stuff detailed in 
-<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/ENCRYPTION.txt">ENCRYPTION.txt</A>.</LI>
+<A HREF="ftp://samba.org/pub/samba/docs/ENCRYPTION.txt">ENCRYPTION.txt</A>.</LI>
 <LI> Follow Microsoft's directions for setting your NT box to allow plain text passwords. see 
 <A HREF="http://www.microsoft.com/kb/articles/q166/7/30.htm">Knowledge Base Article Q166730</A></LI>
 </OL>
diff --git a/docs/faq/sambafaq.html b/docs/faq/sambafaq.html
index 9c45d524dd..2c703885cd 100644
--- a/docs/faq/sambafaq.html
+++ b/docs/faq/sambafaq.html
@@ -45,7 +45,7 @@ Table of Contents
 <HR>
 <H1> Samba FAQ</H1>
 
-<H2>Paul Blackman, <CODE>ictinus@samba.anu.edu.au</CODE></H2>v 0.8, June '97
+<H2>Paul Blackman, <CODE>ictinus@samba.org</CODE></H2>v 0.8, June '97
 <P><HR><EM> This is the Frequently Asked Questions (FAQ) document for
 Samba, the free and very popular SMB server product. An SMB server
 allows file and printer connections from clients such as Windows,
diff --git a/docs/faq/sambafaq.sgml b/docs/faq/sambafaq.sgml
index d306881b56..4faf10a6a5 100644
--- a/docs/faq/sambafaq.sgml
+++ b/docs/faq/sambafaq.sgml
@@ -17,7 +17,7 @@
 
 <title> Samba FAQ
 
-<author>Paul Blackman, <tt>ictinus@samba.anu.edu.au</tt>
+<author>Paul Blackman, <tt>ictinus@samba.org</tt>
 
 <date>v 0.8, June '97
 
@@ -74,14 +74,14 @@ and this FAQ were originally written by Karl Auer.
 
 <sect1> What is the current version of Samba? <p><label id="current_version">
 At time of writing, the current version was 1.9.17. If you want to be
-sure check the bottom of the change-log file. <url url="ftp://samba.anu.edu.au/pub/samba/alpha/change-log">
+sure check the bottom of the change-log file. <url url="ftp://samba.org/pub/samba/alpha/change-log">
 
 For more information see <ref id="version_nums" name="What do the
 version numbers mean?">
 
 <sect1> Where can I get it? <p> <label id="where">
 The Samba suite is available via anonymous ftp from
-samba.anu.edu.au. The latest and greatest versions of the suite are in
+samba.org. The latest and greatest versions of the suite are in
 the directory:
 
 /pub/samba/
@@ -200,48 +200,48 @@ There are a number of places to look for more information on Samba, including:
     <item>A searchable hypertext archive of the Samba mailing list.
     <item>Links to Samba source code, binaries, and mirrors of both.
   </itemize>
-<item>The long list of topic documentation.  These files can be found in the 'docs' directory of the Samba source, or at <url url="ftp://samba.anu.edu.au/pub/samba/docs/">
+<item>The long list of topic documentation.  These files can be found in the 'docs' directory of the Samba source, or at <url url="ftp://samba.org/pub/samba/docs/">
   <itemize>
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/Application_Serving.txt" name="Application_Serving.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt" name="BROWSING.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/BUGS.txt" name="BUGS.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/DIAGNOSIS.txt" name="DIAGNOSIS.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/DNIX.txt" name="DNIX.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/DOMAIN.txt" name="DOMAIN.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/DOMAIN_CONTROL.txt" name="CONTROL.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/ENCRYPTION.txt" name="ENCRYPTION.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/Faxing.txt" name="Faxing.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/GOTCHAS.txt" name="GOTCHAS.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/HINTS.txt" name="HINTS.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/INSTALL.sambatar" name="INSTALL.sambatar">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/INSTALL.txt" name="INSTALL.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/MIRRORS" name="MIRRORS">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/NetBIOS.txt" name="NetBIOS.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/OS2.txt" name="OS2.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/PROJECTS" name="PROJECTS">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/Passwords.txt" name="Passwords.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/Printing.txt" name="Printing.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/README.DCEDFS" name="README.DCEDFS">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/README.OS2" name="README.OS2">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/README.jis" name="README.jis">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/README.sambatar" name="README.sambatar">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/SCO.txt" name="SCO.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/SMBTAR.notes" name="SMBTAR.notes">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/Speed.txt" name="Speed.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/Support.txt" name="Support.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/THANKS" name="THANKS">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/Tracing.txt" name="Tracing.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/UNIX-SMB.txt" name="SMB.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/Warp.txt" name="Warp.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/WinNT.txt" name="WinNT.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/history" name="history">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/security_level.txt" name="level.txt">
-    <item><url url="ftp://samba.anu.edu.au/pub/samba/docs/wfw_slip.htm" name="slip.htm">
+    <item><url url="ftp://samba.org/pub/samba/docs/Application_Serving.txt" name="Application_Serving.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/BROWSING.txt" name="BROWSING.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/BUGS.txt" name="BUGS.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/DIAGNOSIS.txt" name="DIAGNOSIS.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/DNIX.txt" name="DNIX.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/DOMAIN.txt" name="DOMAIN.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/DOMAIN_CONTROL.txt" name="CONTROL.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/ENCRYPTION.txt" name="ENCRYPTION.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/Faxing.txt" name="Faxing.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/GOTCHAS.txt" name="GOTCHAS.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/HINTS.txt" name="HINTS.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/INSTALL.sambatar" name="INSTALL.sambatar">
+    <item><url url="ftp://samba.org/pub/samba/docs/INSTALL.txt" name="INSTALL.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/MIRRORS" name="MIRRORS">
+    <item><url url="ftp://samba.org/pub/samba/docs/NetBIOS.txt" name="NetBIOS.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/OS2.txt" name="OS2.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/PROJECTS" name="PROJECTS">
+    <item><url url="ftp://samba.org/pub/samba/docs/Passwords.txt" name="Passwords.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/Printing.txt" name="Printing.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/README.DCEDFS" name="README.DCEDFS">
+    <item><url url="ftp://samba.org/pub/samba/docs/README.OS2" name="README.OS2">
+    <item><url url="ftp://samba.org/pub/samba/docs/README.jis" name="README.jis">
+    <item><url url="ftp://samba.org/pub/samba/docs/README.sambatar" name="README.sambatar">
+    <item><url url="ftp://samba.org/pub/samba/docs/SCO.txt" name="SCO.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/SMBTAR.notes" name="SMBTAR.notes">
+    <item><url url="ftp://samba.org/pub/samba/docs/Speed.txt" name="Speed.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/Support.txt" name="Support.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/THANKS" name="THANKS">
+    <item><url url="ftp://samba.org/pub/samba/docs/Tracing.txt" name="Tracing.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/UNIX-SMB.txt" name="SMB.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/Warp.txt" name="Warp.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/WinNT.txt" name="WinNT.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/history" name="history">
+    <item><url url="ftp://samba.org/pub/samba/docs/security_level.txt" name="level.txt">
+    <item><url url="ftp://samba.org/pub/samba/docs/wfw_slip.htm" name="slip.htm">
   </itemize>
 </itemize>
 
 <sect1>How do I subscribe to the Samba Mailing Lists?<p><label id="mailinglist">
-Send email to <htmlurl url="mailto:listproc@samba.anu.edu.au" name="listproc@samba.anu.edu.au">. Make sure the subject line is
+Send email to <htmlurl url="mailto:listproc@samba.org" name="listproc@samba.org">. Make sure the subject line is
 blank, and include the following two lines in the body of the message:
 <tscreen><verb>
 subscribe samba Firstname Lastname
@@ -257,7 +257,7 @@ been received by the list since the last time and sends a copy of this
 message to all subscribers.
 
 If you stop being interested in Samba, please send another email to
-<htmlurl url="mailto:listproc@samba.anu.edu.au" name="listproc@samba.anu.edu.au">. Make sure the subject line is blank, and
+<htmlurl url="mailto:listproc@samba.org" name="listproc@samba.org">. Make sure the subject line is blank, and
 include the following two lines in the body of the message:
 <tscreen><verb>
 unsubscribe samba
@@ -273,7 +273,7 @@ carried out the first three steps given here!
 
 Firstly, see if there are any likely looking entries in this FAQ! If
 you have just installed Samba, have you run through the checklist in
-<url url="ftp://samba.anu.edu.au/pub/samba/DIAGNOSIS.txt" name="DIAGNOSIS.txt">? It can save you a lot of time and effort.
+<url url="ftp://samba.org/pub/samba/DIAGNOSIS.txt" name="DIAGNOSIS.txt">? It can save you a lot of time and effort.
 DIAGNOSIS.txt can also be found in the docs directory of the Samba distribution.
 
 Secondly, read the man pages for smbd, nmbd and smb.conf, looking for
@@ -300,7 +300,7 @@ I can incorporate it in the next version.
 If you make changes to the source code, _please_ submit these patches
 so that everyone else gets the benefit of your work. This is one of
 the most important aspects to the maintainence of Samba. Send all
-patches to <htmlurl url="mailto:samba-bugs@samba.anu.edu.au" name="samba-bugs@samba.anu.edu.au">. Do not send patches to Andrew Tridgell or any
+patches to <htmlurl url="mailto:samba-bugs@samba.org" name="samba-bugs@samba.org">. Do not send patches to Andrew Tridgell or any
 other individual, they may be lost if you do.
 
 <sect1> Pizza supply details <p> <label id="pizza">
@@ -332,7 +332,7 @@ hungry sniffer dogs but it will have been a noble gesture.
 <sect>Compiling and installing Samba on a Unix host<p><label id="unix_install">
 
 <sect1>I can't see the Samba server in any browse lists!<p><label id="no_browse">
- See <url url="ftp://samba.anu.edu.au/pub/samba/BROWSING.txt" name="BROWSING.txt">
+ See <url url="ftp://samba.org/pub/samba/BROWSING.txt" name="BROWSING.txt">
  for more information on browsing.  Browsing.txt can also be found
  in the docs directory of the Samba source.
 
@@ -412,7 +412,7 @@ network" doesn't fit well with clients possibly running on multiuser
 machines (such as users of smbclient under Unix). Having said that,
 several developers are working hard on building it in to the next
 major version of Samba. If you can contribute, send a message to
-<htmlurl url="mailto:samba-bugs@samba.anu.edu.au" name="samba-bugs@samba.anu.edu.au"> !
+<htmlurl url="mailto:samba-bugs@samba.org" name="samba-bugs@samba.org"> !
 
 Seeing this message should not affect your ability to mount redirected
 disks and printers, which is really what all this is about.
@@ -459,7 +459,7 @@ as a strictly temporary solution.
 In earlier Samba versions there were some difficulties with the very
 latest Microsoft products, particularly Excel 5 and Word for Windows
 6. These should have all been solved. If not then please let Andrew
-Tridgell know via email at <htmlurl url="mailto:samba-bugs@samba.anu.edu.au" name="samba-bugs@samba.anu.edu.au">.
+Tridgell know via email at <htmlurl url="mailto:samba-bugs@samba.org" name="samba-bugs@samba.org">.
 
 <sect1>My "server string" doesn't seem to be recognised<p><label id="bad_server_string">
 OR My client reports the default setting, eg. "Samba 1.9.15p4", instead
@@ -565,7 +565,7 @@ To syncronize your PC's clock with your Samba server:
 <item> Copy timesync.pif to your windows directory
  <item> timesync.pif can be found at:
     <url 
-url="http://samba.anu.edu.au/samba/binaries/miscellaneous/timesync.pif">
+url="http://samba.org/samba/binaries/miscellaneous/timesync.pif">
 <item> Add timesync.pif to your 'Start Up' group/folder
 <item> Open the properties dialog box for the program/icon
 <item> Make sure the 'Run Minimized' option is set in program 'Properties'
@@ -576,7 +576,7 @@ Each time you start your computer (or login for Win95) your PC will
 synchronize its clock with your Samba server.
 
 Alternativley, if you clients support Domain Logons, you can setup Domain Logons with Samba
- - see: <url url="ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt" name="BROWSING.txt"> *** for more information.
+ - see: <url url="ftp://samba.org/pub/samba/docs/BROWSING.txt" name="BROWSING.txt"> *** for more information.
 <p>Then add 
 <tscreen><verb>
 NET TIME \\%L /SET /YES
@@ -606,7 +606,7 @@ over this connection. This is unfortunate, but not fatal.
 It means that if you run your Samba server in share level security
 (the default) then things will definately break as described
 above. The share level SMB security model has no provision for
-multiple user IDs on the one SMB connection. See <url url="ftp://samba.anu.edu.au/pub/samba/docs/security_level.txt" name="security_level.txt"> in
+multiple user IDs on the one SMB connection. See <url url="ftp://samba.org/pub/samba/docs/security_level.txt" name="security_level.txt"> in
 the docs for more info on share/user/server level security.
 
 If you run in user or server level security then you have a chance,
@@ -755,7 +755,7 @@ You could also try setting the driver to NULL like this:
      printer driver = NULL
 </verb></tscreen>
 this is effectively what older versions of Samba did, so if that
-worked for you then give it a go. If this does work then let us know via <htmlurl url="mailto:samba-bugs@samba.anu.edu.au" name="samba-bugs@samba.anu.edu.au">,
+worked for you then give it a go. If this does work then let us know via <htmlurl url="mailto:samba-bugs@samba.org" name="samba-bugs@samba.org">,
 and we'll make it the default. Currently the default is a 0 length
 string.
 
@@ -764,7 +764,7 @@ As of SP3, Microsoft has decided that they will no longer default to
 passing clear text passwords over the network.  To enable access to 
 Samba shares from NT 4.0 SP3, you must do <bf>ONE</bf> of two things:
 <enum>
-<item> Set the Samba configuration option 'security = user' and implement all of the stuff detailed in <url url="ftp://samba.anu.edu.au/pub/samba/docs/ENCRYPTION.txt" name="ENCRYPTION.txt">.
+<item> Set the Samba configuration option 'security = user' and implement all of the stuff detailed in <url url="ftp://samba.org/pub/samba/docs/ENCRYPTION.txt" name="ENCRYPTION.txt">.
 <item> Follow Microsoft's directions for setting your NT box to allow plain text passwords. see <url url="http://www.microsoft.com/kb/articles/q166/7/30.htm" name="Knowledge Base Article Q166730">
 </enum>
 
diff --git a/docs/faq/sambafaq.txt b/docs/faq/sambafaq.txt
index 7108846ae6..f16916b29e 100644
--- a/docs/faq/sambafaq.txt
+++ b/docs/faq/sambafaq.txt
@@ -1,5 +1,5 @@
   Samba FAQ
-  Paul Blackman, ictinus@samba.anu.edu.au
+  Paul Blackman, ictinus@samba.org
   v 0.8, June '97
 
   This is the Frequently Asked Questions (FAQ) document for Samba, the
@@ -160,7 +160,7 @@
 
   At time of writing, the current version was 1.9.17. If you want to be
   sure check the bottom of the change-log file.
-  <ftp://samba.anu.edu.au/pub/samba/alpha/change-log>
+  <ftp://samba.org/pub/samba/alpha/change-log>
 
   For more information see ``What do the version numbers mean?''
 
@@ -168,7 +168,7 @@
   11..33..  WWhheerree ccaann II ggeett iitt??
 
 
-  The Samba suite is available via anonymous ftp from samba.anu.edu.au.
+  The Samba suite is available via anonymous ftp from samba.org.
   The latest and greatest versions of the suite are in the directory:
 
   /pub/samba/
@@ -344,89 +344,89 @@
 
   +o  The long list of topic documentation.  These files can be found in
      the 'docs' directory of the Samba source, or at
-     <ftp://samba.anu.edu.au/pub/samba/docs/>
+     <ftp://samba.org/pub/samba/docs/>
 
   +o  Application_Serving.txt
-     <ftp://samba.anu.edu.au/pub/samba/docs/Application_Serving.txt>
+     <ftp://samba.org/pub/samba/docs/Application_Serving.txt>
 
-  +o  BROWSING.txt <ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt>
+  +o  BROWSING.txt <ftp://samba.org/pub/samba/docs/BROWSING.txt>
 
-  +o  BUGS.txt <ftp://samba.anu.edu.au/pub/samba/docs/BUGS.txt>
+  +o  BUGS.txt <ftp://samba.org/pub/samba/docs/BUGS.txt>
 
-  +o  DIAGNOSIS.txt <ftp://samba.anu.edu.au/pub/samba/docs/DIAGNOSIS.txt>
+  +o  DIAGNOSIS.txt <ftp://samba.org/pub/samba/docs/DIAGNOSIS.txt>
 
-  +o  DNIX.txt <ftp://samba.anu.edu.au/pub/samba/docs/DNIX.txt>
+  +o  DNIX.txt <ftp://samba.org/pub/samba/docs/DNIX.txt>
 
-  +o  DOMAIN.txt <ftp://samba.anu.edu.au/pub/samba/docs/DOMAIN.txt>
+  +o  DOMAIN.txt <ftp://samba.org/pub/samba/docs/DOMAIN.txt>
 
   +o  CONTROL.txt
-     <ftp://samba.anu.edu.au/pub/samba/docs/DOMAIN_CONTROL.txt>
+     <ftp://samba.org/pub/samba/docs/DOMAIN_CONTROL.txt>
 
   +o  ENCRYPTION.txt
-     <ftp://samba.anu.edu.au/pub/samba/docs/ENCRYPTION.txt>
+     <ftp://samba.org/pub/samba/docs/ENCRYPTION.txt>
 
-  +o  Faxing.txt <ftp://samba.anu.edu.au/pub/samba/docs/Faxing.txt>
+  +o  Faxing.txt <ftp://samba.org/pub/samba/docs/Faxing.txt>
 
-  +o  GOTCHAS.txt <ftp://samba.anu.edu.au/pub/samba/docs/GOTCHAS.txt>
+  +o  GOTCHAS.txt <ftp://samba.org/pub/samba/docs/GOTCHAS.txt>
 
-  +o  HINTS.txt <ftp://samba.anu.edu.au/pub/samba/docs/HINTS.txt>
+  +o  HINTS.txt <ftp://samba.org/pub/samba/docs/HINTS.txt>
 
   +o  INSTALL.sambatar
-     <ftp://samba.anu.edu.au/pub/samba/docs/INSTALL.sambatar>
+     <ftp://samba.org/pub/samba/docs/INSTALL.sambatar>
 
-  +o  INSTALL.txt <ftp://samba.anu.edu.au/pub/samba/docs/INSTALL.txt>
+  +o  INSTALL.txt <ftp://samba.org/pub/samba/docs/INSTALL.txt>
 
-  +o  MIRRORS <ftp://samba.anu.edu.au/pub/samba/docs/MIRRORS>
+  +o  MIRRORS <ftp://samba.org/pub/samba/docs/MIRRORS>
 
-  +o  NetBIOS.txt <ftp://samba.anu.edu.au/pub/samba/docs/NetBIOS.txt>
+  +o  NetBIOS.txt <ftp://samba.org/pub/samba/docs/NetBIOS.txt>
 
-  +o  OS2.txt <ftp://samba.anu.edu.au/pub/samba/docs/OS2.txt>
+  +o  OS2.txt <ftp://samba.org/pub/samba/docs/OS2.txt>
 
-  +o  PROJECTS <ftp://samba.anu.edu.au/pub/samba/docs/PROJECTS>
+  +o  PROJECTS <ftp://samba.org/pub/samba/docs/PROJECTS>
 
-  +o  Passwords.txt <ftp://samba.anu.edu.au/pub/samba/docs/Passwords.txt>
+  +o  Passwords.txt <ftp://samba.org/pub/samba/docs/Passwords.txt>
 
-  +o  Printing.txt <ftp://samba.anu.edu.au/pub/samba/docs/Printing.txt>
+  +o  Printing.txt <ftp://samba.org/pub/samba/docs/Printing.txt>
 
-  +o  README.DCEDFS <ftp://samba.anu.edu.au/pub/samba/docs/README.DCEDFS>
+  +o  README.DCEDFS <ftp://samba.org/pub/samba/docs/README.DCEDFS>
 
-  +o  README.OS2 <ftp://samba.anu.edu.au/pub/samba/docs/README.OS2>
+  +o  README.OS2 <ftp://samba.org/pub/samba/docs/README.OS2>
 
-  +o  README.jis <ftp://samba.anu.edu.au/pub/samba/docs/README.jis>
+  +o  README.jis <ftp://samba.org/pub/samba/docs/README.jis>
 
   +o  README.sambatar
-     <ftp://samba.anu.edu.au/pub/samba/docs/README.sambatar>
+     <ftp://samba.org/pub/samba/docs/README.sambatar>
 
-  +o  SCO.txt <ftp://samba.anu.edu.au/pub/samba/docs/SCO.txt>
+  +o  SCO.txt <ftp://samba.org/pub/samba/docs/SCO.txt>
 
-  +o  SMBTAR.notes <ftp://samba.anu.edu.au/pub/samba/docs/SMBTAR.notes>
+  +o  SMBTAR.notes <ftp://samba.org/pub/samba/docs/SMBTAR.notes>
 
-  +o  Speed.txt <ftp://samba.anu.edu.au/pub/samba/docs/Speed.txt>
+  +o  Speed.txt <ftp://samba.org/pub/samba/docs/Speed.txt>
 
-  +o  Support.txt <ftp://samba.anu.edu.au/pub/samba/docs/Support.txt>
+  +o  Support.txt <ftp://samba.org/pub/samba/docs/Support.txt>
 
-  +o  THANKS <ftp://samba.anu.edu.au/pub/samba/docs/THANKS>
+  +o  THANKS <ftp://samba.org/pub/samba/docs/THANKS>
 
-  +o  Tracing.txt <ftp://samba.anu.edu.au/pub/samba/docs/Tracing.txt>
+  +o  Tracing.txt <ftp://samba.org/pub/samba/docs/Tracing.txt>
 
-  +o  SMB.txt <ftp://samba.anu.edu.au/pub/samba/docs/UNIX-SMB.txt>
+  +o  SMB.txt <ftp://samba.org/pub/samba/docs/UNIX-SMB.txt>
 
-  +o  Warp.txt <ftp://samba.anu.edu.au/pub/samba/docs/Warp.txt>
+  +o  Warp.txt <ftp://samba.org/pub/samba/docs/Warp.txt>
 
-  +o  WinNT.txt <ftp://samba.anu.edu.au/pub/samba/docs/WinNT.txt>
+  +o  WinNT.txt <ftp://samba.org/pub/samba/docs/WinNT.txt>
 
-  +o  history <ftp://samba.anu.edu.au/pub/samba/docs/history>
+  +o  history <ftp://samba.org/pub/samba/docs/history>
 
   +o  level.txt
-     <ftp://samba.anu.edu.au/pub/samba/docs/security_level.txt>
+     <ftp://samba.org/pub/samba/docs/security_level.txt>
 
-  +o  slip.htm <ftp://samba.anu.edu.au/pub/samba/docs/wfw_slip.htm>
+  +o  slip.htm <ftp://samba.org/pub/samba/docs/wfw_slip.htm>
 
 
   11..77..  HHooww ddoo II ssuubbssccrriibbee ttoo tthhee SSaammbbaa MMaaiilliinngg LLiissttss??
 
 
-  Send email to listproc@samba.anu.edu.au. Make sure the subject line is
+  Send email to listproc@samba.org. Make sure the subject line is
   blank, and include the following two lines in the body of the message:
 
 
@@ -446,7 +446,7 @@
   message to all subscribers.
 
   If you stop being interested in Samba, please send another email to
-  listproc@samba.anu.edu.au. Make sure the subject line is blank, and
+  listproc@samba.org. Make sure the subject line is blank, and
   include the following two lines in the body of the message:
 
 
@@ -470,7 +470,7 @@
 
   Firstly, see if there are any likely looking entries in this FAQ! If
   you have just installed Samba, have you run through the checklist in
-  DIAGNOSIS.txt <ftp://samba.anu.edu.au/pub/samba/DIAGNOSIS.txt>? It can
+  DIAGNOSIS.txt <ftp://samba.org/pub/samba/DIAGNOSIS.txt>? It can
   save you a lot of time and effort.  DIAGNOSIS.txt can also be found in
   the docs directory of the Samba distribution.
 
@@ -497,7 +497,7 @@
   If you make changes to the source code, _please_ submit these patches
   so that everyone else gets the benefit of your work. This is one of
   the most important aspects to the maintainence of Samba. Send all
-  patches to samba-bugs@samba.anu.edu.au. Do not send patches to Andrew
+  patches to samba-bugs@samba.org. Do not send patches to Andrew
   Tridgell or any other individual, they may be lost if you do.
 
 
@@ -538,7 +538,7 @@
   22..11..  II ccaann''tt sseeee tthhee SSaammbbaa sseerrvveerr iinn aannyy bbrroowwssee lliissttss!!
 
 
-  See BROWSING.txt <ftp://samba.anu.edu.au/pub/samba/BROWSING.txt> for
+  See BROWSING.txt <ftp://samba.org/pub/samba/BROWSING.txt> for
   more information on browsing.  Browsing.txt can also be found in the
   docs directory of the Samba source.
 
@@ -646,7 +646,7 @@
   machines (such as users of smbclient under Unix). Having said that,
   several developers are working hard on building it in to the next
   major version of Samba. If you can contribute, send a message to
-  samba-bugs@samba.anu.edu.au !
+  samba-bugs@samba.org !
 
   Seeing this message should not affect your ability to mount redirected
   disks and printers, which is really what all this is about.
@@ -703,7 +703,7 @@
   In earlier Samba versions there were some difficulties with the very
   latest Microsoft products, particularly Excel 5 and Word for Windows
   6. These should have all been solved. If not then please let Andrew
-  Tridgell know via email at samba-bugs@samba.anu.edu.au.
+  Tridgell know via email at samba-bugs@samba.org.
 
 
   22..99..  MMyy ""sseerrvveerr ssttrriinngg"" ddooeessnn''tt sseeeemm ttoo bbee rreeccooggnniisseedd
@@ -827,7 +827,7 @@
   +o  Copy timesync.pif to your windows directory
 
   +o  timesync.pif can be found at:
-     <http://samba.anu.edu.au/samba/binaries/miscellaneous/timesync.pif>
+     <http://samba.org/samba/binaries/miscellaneous/timesync.pif>
 
   +o  Add timesync.pif to your 'Start Up' group/folder
 
@@ -845,7 +845,7 @@
 
   Alternativley, if you clients support Domain Logons, you can setup
   Domain Logons with Samba - see: BROWSING.txt
-  <ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt> *** for more
+  <ftp://samba.org/pub/samba/docs/BROWSING.txt> *** for more
   information.
 
   Then add
@@ -883,7 +883,7 @@
   (the default) then things will definately break as described above.
   The share level SMB security model has no provision for multiple user
   IDs on the one SMB connection. See security_level.txt
-  <ftp://samba.anu.edu.au/pub/samba/docs/security_level.txt> in the docs
+  <ftp://samba.org/pub/samba/docs/security_level.txt> in the docs
   for more info on share/user/server level security.
 
   If you run in user or server level security then you have a chance,
@@ -1050,7 +1050,7 @@
 
   this is effectively what older versions of Samba did, so if that
   worked for you then give it a go. If this does work then let us know
-  via samba-bugs@samba.anu.edu.au, and we'll make it the default. Cur-
+  via samba-bugs@samba.org, and we'll make it the default. Cur-
   rently the default is a 0 length string.
 
 
@@ -1064,7 +1064,7 @@
 
   1. Set the Samba configuration option 'security = user' and implement
      all of the stuff detailed in ENCRYPTION.txt
-     <ftp://samba.anu.edu.au/pub/samba/docs/ENCRYPTION.txt>.
+     <ftp://samba.org/pub/samba/docs/ENCRYPTION.txt>.
 
   2. Follow Microsoft's directions for setting your NT box to allow
      plain text passwords. see Knowledge Base Article Q166730
diff --git a/docs/htmldocs/DOMAIN_MEMBER.html b/docs/htmldocs/DOMAIN_MEMBER.html
index 98855a3e65..6d9741f2f2 100644
--- a/docs/htmldocs/DOMAIN_MEMBER.html
+++ b/docs/htmldocs/DOMAIN_MEMBER.html
@@ -5,7 +5,7 @@
 
 <html><head><title>Joining an NT Domain with Samba 2.0</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
diff --git a/docs/htmldocs/lmhosts.5.html b/docs/htmldocs/lmhosts.5.html
index d3ffedaff6..ece68eb511 100644
--- a/docs/htmldocs/lmhosts.5.html
+++ b/docs/htmldocs/lmhosts.5.html
@@ -5,7 +5,7 @@
 
 <html><head><title>lmhosts (5)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -78,7 +78,7 @@ as the <a href="smb.conf.html"><strong>smb.conf</strong></a> file.
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Samba is now developed
+Andrew Tridgell <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 <p><br>The original Samba man pages were written by Karl Auer. The man page
@@ -86,7 +86,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
 and updated for the Samba2.0 release by Jeremy Allison.
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> 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/htmldocs/make_smbcodepage.1.html b/docs/htmldocs/make_smbcodepage.1.html
index 10615deb86..3fa9a1c535 100644
--- a/docs/htmldocs/make_smbcodepage.1.html
+++ b/docs/htmldocs/make_smbcodepage.1.html
@@ -5,7 +5,7 @@
 
 <html><head><title>make_smbcodepage (1)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -74,7 +74,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 <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. All codepage files in the
+them to <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. All codepage files in the
 Samba <em>source/codepages</em> directory are compiled and installed when a
 <em>'make install'</em> command is issued there.
 <p><br>The client codepage used by the <a href="smbd.8.html"><strong>smbd</strong></a> server is
@@ -128,7 +128,7 @@ by all.  The program should NOT be setuid or setgid!
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Samba is now developed
+Andrew Tridgell <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 <p><br>The original Samba man pages were written by Karl Auer. The man page
@@ -136,7 +136,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
 and updated for the Samba2.0 release by Jeremy Allison.
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> 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/htmldocs/nmbd.8.html b/docs/htmldocs/nmbd.8.html
index dc8f5b0de3..3139e90ad1 100644
--- a/docs/htmldocs/nmbd.8.html
+++ b/docs/htmldocs/nmbd.8.html
@@ -5,7 +5,7 @@
 
 <html><head><title>nmbd</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -190,12 +190,12 @@ level.
 (1)</strong></a>, and the Internet RFC's <strong>rfc1001.txt</strong>,
 <strong>rfc1002.txt</strong>. In addition the CIFS (formerly SMB) specification is
 available as a link from the Web page :
-<a href="http://samba.anu.edu.au/cifs/">http://samba.anu.edu.au/cifs/</a>.
+<a href="http://samba.org/cifs/">http://samba.org/cifs/</a>.
 <p><br><a name="AUTHOR"></a>
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Samba is now developed
+Andrew Tridgell <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 <p><br>The original Samba man pages were written by Karl Auer. The man page
@@ -203,7 +203,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
 and updated for the Samba2.0 release by Jeremy Allison.
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> 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/htmldocs/nmblookup.1.html b/docs/htmldocs/nmblookup.1.html
index 217ddd7965..5ff58e5b40 100644
--- a/docs/htmldocs/nmblookup.1.html
+++ b/docs/htmldocs/nmblookup.1.html
@@ -5,7 +5,7 @@
 
 <html><head><title>nmblookup (1)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -115,8 +115,8 @@ which will return all registered names within a broadcast area.
 <strong>nmblookup</strong> must be called like this:
 <p><br><code>nmblookup -U server -R 'name'</code>
 <p><br>For example, running :
-<p><br><code>nmblookup -U samba.anu.edu.au -R IRIX#1B'</code>
-<p><br>would query the WINS server samba.anu.edu.au for the domain master
+<p><br><code>nmblookup -U samba.org -R IRIX#1B'</code>
+<p><br>would query the WINS server samba.org for the domain master
 browser (1B name type) for the IRIX workgroup.
 <p><br><a name="VERSION"></a>
 <h2>VERSION</h2>
@@ -131,7 +131,7 @@ browser (1B name type) for the IRIX workgroup.
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Samba is now developed
+Andrew Tridgell <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 <p><br>The original Samba man pages were written by Karl Auer. The man page
@@ -139,7 +139,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
 and updated for the Samba2.0 release by Jeremy Allison.
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> 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/htmldocs/samba.7.html b/docs/htmldocs/samba.7.html
index 1f6b8a0ae5..f197ccfa32 100644
--- a/docs/htmldocs/samba.7.html
+++ b/docs/htmldocs/samba.7.html
@@ -4,7 +4,7 @@
 
 <html><head><title>Samba (7)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -39,7 +39,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 <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+to <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br><ul> 
 <p><br><li><strong><a href="smbd.8.html"><strong>smbd</strong></a></strong> <br> <br> The <a href="smbd.8.html"><strong>smbd</strong>
 (8)</a> daemon provides the file and print services to SMB
@@ -84,7 +84,7 @@ passwords on Samba and Windows NT(tm) servers.
 file COPYING. You are encouraged to distribute copies of the Samba
 suite, but please obey the terms of this license.
 <p><br>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.
 <p><br>You may also find useful information about Samba on the newsgroup
 comp.protocols.smb and the Samba mailing list. Details on how to join
@@ -92,7 +92,7 @@ the mailing list are given in the README file that comes with Samba.
 <p><br>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
-<a href="http://samba.anu.edu.au/samba/">http://samba.anu.edu.au/samba/</a>.
+<a href="http://samba.org/samba/">http://samba.org/samba/</a>.
 <p><br><a name="VERSION"></a>
 <h2>VERSION</h2>
     
@@ -101,12 +101,12 @@ of the Samba mailing list, at
 <h2>CONTRIBUTIONS</h2>
     
 <p><br>If you wish to contribute to the Samba project, then I suggest you
-join the Samba mailing list at <a href="mailto:samba@samba.anu.edu.au"><em>samba@samba.anu.edu.au</em></a>. See the
+join the Samba mailing list at <a href="mailto:samba@samba.org"><em>samba@samba.org</em></a>. See the
 Web page at
-<a href="http://samba.anu.edu.au/listproc">http://samba.anu.edu.au/listproc</a>
+<a href="http://samba.org/listproc">http://samba.org/listproc</a>
 for details on how to do this.
 <p><br>If you have patches to submit or bugs to report then you may mail them
-directly to <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Note, however, that due to
+directly to <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. 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 <em>diff -u</em> format.
 <p><br><a name="CREDITS"></a>
@@ -114,20 +114,20 @@ time to respond to mail. We prefer patches in <em>diff -u</em> format.
     
 <p><br>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
-<a href="ftp://samba.anu.edu.au/pub/samba/alpha/change-log">ftp://samba.anu.edu.au/pub/samba/alpha/change-log</a>
+<a href="ftp://samba.org/pub/samba/alpha/change-log">ftp://samba.org/pub/samba/alpha/change-log</a>
 for the pre-CVS changes and at
-<a href="ftp://samba.anu.edu.au/pub/samba/alpha/cvs.log">ftp://samba.anu.edu.au/pub/samba/alpha/cvs.log</a>
+<a href="ftp://samba.org/pub/samba/alpha/cvs.log">ftp://samba.org/pub/samba/alpha/cvs.log</a>
 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.
 <p><br>In addition, several commercial organizations now help fund the Samba
 Team with money and equipment. For details see the Samba Web pages at
-<a href="http://samba.anu.edu.au/samba/samba-thanks.html">http://samba.anu.edu.au/samba/samba-thanks.html</a>.
+<a href="http://samba.org/samba/samba-thanks.html">http://samba.org/samba/samba-thanks.html</a>.
 <p><br><a name="AUTHOR"></a>
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Samba is now developed
+Andrew Tridgell <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 <p><br>The original Samba man pages were written by Karl Auer. The man page
@@ -135,6 +135,6 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
 and updated for the Samba2.0 release by Jeremy Allison.
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 </body>
 </html>
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index a0c1eb82b3..a206451979 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -5,7 +5,7 @@
 
 <html><head><title>smb.conf (5)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -311,7 +311,7 @@ negotiation. It can be one of CORE, COREPLUS, LANMAN1, LANMAN2 or NT1.
 machine. Only some are recognized, and those may not be 100%
 reliable. It currently recognizes Samba, WfWg, WinNT and
 Win95. Anything else will be known as "UNKNOWN". If it gets it wrong
-then sending a level 3 log to <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>
+then sending a level 3 log to <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>
 should allow it to be fixed.
 <p><br><a name="percentI"></a>
 <li > <strong>%I</strong> = The IP address of the client machine.
@@ -1238,7 +1238,7 @@ Samba NT Domain Controller Code. It may be removed in a later release.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list <strong>Samba-ntdom</strong> available by sending email to
-<a href="mailto:listproc@samba.anu.edu.au"><em>listproc@samba.anu.edu.au</em></a>
+<a href="mailto:listproc@samba.org"><em>listproc@samba.org</em></a>
 <p><br><a name="domainadminusers"></a> 
 <li><strong><strong>domain admin users (G)</strong></strong>
 <p><br>This is an <strong>EXPERIMENTAL</strong> parameter that is part of the unfinished
@@ -1246,7 +1246,7 @@ Samba NT Domain Controller Code. It may be removed in a later release.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list <strong>Samba-ntdom</strong> available by sending email to
-<a href="mailto:listproc@samba.anu.edu.au"><em>listproc@samba.anu.edu.au</em></a>
+<a href="mailto:listproc@samba.org"><em>listproc@samba.org</em></a>
 <p><br><a name="domaincontroller"></a>
 <li><strong><strong>domain controller (G)</strong></strong>
 <p><br>This is a <strong>DEPRECATED</strong> parameter. It is currently not used within
@@ -1259,7 +1259,7 @@ Samba NT Domain Controller Code. It may be removed in a later release.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list <strong>Samba-ntdom</strong> available by sending email to
-<a href="mailto:listproc@samba.anu.edu.au"><em>listproc@samba.anu.edu.au</em></a>
+<a href="mailto:listproc@samba.org"><em>listproc@samba.org</em></a>
 <p><br><a name="domainguestgroup"></a>
 <li><strong><strong>domain guest group (G)</strong></strong>
 <p><br>This is an <strong>EXPERIMENTAL</strong> parameter that is part of the unfinished
@@ -1267,7 +1267,7 @@ Samba NT Domain Controller Code. It may be removed in a later release.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list <strong>Samba-ntdom</strong> available by sending email to
-<a href="mailto:listproc@samba.anu.edu.au"><em>listproc@samba.anu.edu.au</em></a>
+<a href="mailto:listproc@samba.org"><em>listproc@samba.org</em></a>
 <p><br><a name="domainguestusers"></a>
 <li><strong><strong>domain guest users (G)</strong></strong>
 <p><br>This is an <strong>EXPERIMENTAL</strong> parameter that is part of the unfinished
@@ -1275,7 +1275,7 @@ Samba NT Domain Controller Code. It may be removed in a later release.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list <strong>Samba-ntdom</strong> available by sending email to
-<a href="mailto:listproc@samba.anu.edu.au"><em>listproc@samba.anu.edu.au</em></a>
+<a href="mailto:listproc@samba.org"><em>listproc@samba.org</em></a>
 <p><br><a name="domainlogons"></a>
 <li><strong><strong>domain logons (G)</strong></strong>
 <p><br>If set to true, the Samba server will serve Windows 95/98 Domain
@@ -3614,7 +3614,7 @@ appropriate documentation for your operating system first (perhaps
 option" when you supply an option. This means you either incorrectly 
 typed it or you need to add an include file to includes.h for your OS. 
 If the latter is the case please send the patch to
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>Any of the supported socket options may be combined in any way you
 like, as long as your OS allows it.
 <p><br>This is the list of socket options currently settable using this
@@ -4440,7 +4440,7 @@ permissions on spool directories are correct.
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Samba is now developed
+Andrew Tridgell <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 <p><br>The original Samba man pages were written by Karl Auer. The man page
@@ -4448,7 +4448,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
 and updated for the Samba2.0 release by Jeremy Allison.
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> 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/htmldocs/smbclient.1.html b/docs/htmldocs/smbclient.1.html
index 533066c500..71a3b786bf 100644
--- a/docs/htmldocs/smbclient.1.html
+++ b/docs/htmldocs/smbclient.1.html
@@ -5,7 +5,7 @@
 
 <html><head><title>smbclient (1)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -567,7 +567,7 @@ level used by the client. If you have problems, set the debug level to
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Samba is now developed
+Andrew Tridgell <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 <p><br>The original Samba man pages were written by Karl Auer. The man page
@@ -575,7 +575,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
 and updated for the Samba2.0 release by Jeremy Allison.
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> 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/htmldocs/smbd.8.html b/docs/htmldocs/smbd.8.html
index a6e0f32e12..78d8c3587a 100644
--- a/docs/htmldocs/smbd.8.html
+++ b/docs/htmldocs/smbd.8.html
@@ -5,7 +5,7 @@
 
 <html><head><title>smbd (8)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -363,12 +363,12 @@ performance.
 <a href="testprns.1.html"><strong>testprns (1)</strong></a>, and the Internet RFC's
 <strong>rfc1001.txt</strong>, <strong>rfc1002.txt</strong>. In addition the CIFS (formerly SMB)
 specification is available as a link from the Web page :
-<a href="http://samba.anu.edu.au/cifs/">http://samba.anu.edu.au/cifs/</a>.
+<a href="http://samba.org/cifs/">http://samba.org/cifs/</a>.
 <p><br><a name="AUTHOR"></a>
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Samba is now developed
+Andrew Tridgell <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 <p><br>The original Samba man pages were written by Karl Auer. The man page
@@ -376,7 +376,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
 and updated for the Samba2.0 release by Jeremy Allison.
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> to find out how to get a full list of contributors
 and details on how to submit bug reports, comments etc.
 </body>
diff --git a/docs/htmldocs/smbpasswd.5.html b/docs/htmldocs/smbpasswd.5.html
index 6c4081fc4d..9ff258afad 100644
--- a/docs/htmldocs/smbpasswd.5.html
+++ b/docs/htmldocs/smbpasswd.5.html
@@ -5,7 +5,7 @@
 
 <html><head><title>smbpasswd (5)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -179,7 +179,7 @@ algorithm.
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Samba is now developed
+Andrew Tridgell <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 <p><br>The original Samba man pages were written by Karl Auer. The man page
@@ -187,7 +187,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>) 
 and updated for the Samba2.0 release by Jeremy
-Allison, <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+Allison, <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> 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/htmldocs/smbpasswd.8.html b/docs/htmldocs/smbpasswd.8.html
index 6bfd8cdb44..2b2f466064 100644
--- a/docs/htmldocs/smbpasswd.8.html
+++ b/docs/htmldocs/smbpasswd.8.html
@@ -5,7 +5,7 @@
 
 <html><head><title>smbpasswd (8)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -186,7 +186,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
-<a href="mailto:samba-ntdom@samba.anu.edu.au"><em>samba-ntdom@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-ntdom@samba.org"><em>samba-ntdom@samba.org</em></a>.
 <p><br>This option is only available when running <strong>smbpasswd</strong> as root.
 <p><br><a name="minusj"></a>
 <li><strong><strong>-j DOMAIN</strong></strong> This option is used to add a Samba server into a
@@ -260,7 +260,7 @@ in the docs directory for details on how to do this.
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Samba is now developed
+Andrew Tridgell <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 <p><br>The original Samba man pages were written by Karl Auer. The man page
@@ -268,7 +268,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
 and updated for the Samba2.0 release by Jeremy Allison.
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> 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/htmldocs/smbrun.1.html b/docs/htmldocs/smbrun.1.html
index 9db9b7e783..ccfdd6ff2a 100644
--- a/docs/htmldocs/smbrun.1.html
+++ b/docs/htmldocs/smbrun.1.html
@@ -5,7 +5,7 @@
 
 <html><head><title>smbrun (1)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -70,7 +70,7 @@ commands to issue suitable diagnostics to aid trouble-shooting.
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Samba is now developed
+Andrew Tridgell <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 <p><br>The original Samba man pages were written by Karl Auer. The man page
@@ -78,7 +78,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
 and updated for the Samba2.0 release by Jeremy Allison.
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> 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/htmldocs/smbstatus.1.html b/docs/htmldocs/smbstatus.1.html
index cc48f29d88..9fc53f416b 100644
--- a/docs/htmldocs/smbstatus.1.html
+++ b/docs/htmldocs/smbstatus.1.html
@@ -5,7 +5,7 @@
 
 <html><head><title>smbstatus (1)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -67,7 +67,7 @@ only.
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Samba is now developed
+Andrew Tridgell <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 <p><br>The original Samba man pages were written by Karl Auer. The man page
@@ -75,7 +75,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
 and updated for the Samba2.0 release by Jeremy Allison.
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> 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/htmldocs/smbtar.1.html b/docs/htmldocs/smbtar.1.html
index 610ead88df..ef416f2e6c 100644
--- a/docs/htmldocs/smbtar.1.html
+++ b/docs/htmldocs/smbtar.1.html
@@ -5,7 +5,7 @@
 
 <html><head><title>smbtar (1)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -111,7 +111,7 @@ the <a href="smbclient.1.html"><strong>smbclient</strong></a> command.
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Samba is now developed
+Andrew Tridgell <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 <p><br>Ricky Poulten <a href="mailto:poultenr@logica.co.uk"><em>poultenr@logica.co.uk</em></a> wrote the tar extension and
@@ -122,7 +122,7 @@ etc. The man page sources were converted to YODL format (another
 excellent piece of Open Source software available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
 and updated for the Samba2.0 release by Jeremy Allison,
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> 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/htmldocs/swat.8.html b/docs/htmldocs/swat.8.html
index 31afec1a89..0d43dd494b 100644
--- a/docs/htmldocs/swat.8.html
+++ b/docs/htmldocs/swat.8.html
@@ -5,7 +5,7 @@
 
 <html><head><title>swat (8)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -132,7 +132,7 @@ or don't use <strong>swat</strong>!
 <h2>AUTHOR</h2>
     
 <p><br>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.
 <p><br>The original Samba man pages were written by Karl Auer. The man page
@@ -140,7 +140,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
 and updated for the Samba2.0 release by Jeremy Allison.
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> 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/htmldocs/testparm.1.html b/docs/htmldocs/testparm.1.html
index 6d2c2c92c5..00db231626 100644
--- a/docs/htmldocs/testparm.1.html
+++ b/docs/htmldocs/testparm.1.html
@@ -5,7 +5,7 @@
 
 <html><head><title>testparm (1)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -89,7 +89,7 @@ dumps all known service details to stdout.
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Samba is now developed
+Andrew Tridgell <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 <p><br>The original Samba man pages were written by Karl Auer. The man page
@@ -97,7 +97,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
 and updated for the Samba2.0 release by Jeremy Allison.
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> 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/htmldocs/testprns.1.html b/docs/htmldocs/testprns.1.html
index 62d71a29f2..8afbbb7cd4 100644
--- a/docs/htmldocs/testprns.1.html
+++ b/docs/htmldocs/testprns.1.html
@@ -5,7 +5,7 @@
 
 <html><head><title>testprns (1)</title>
 
-<link rev="made" href="mailto:samba-bugs@samba.anu.edu.au">
+<link rev="made" href="mailto:samba-bugs@samba.org">
 </head>
 <body>
 
@@ -82,7 +82,7 @@ log should be checked carefully for errors and warnings.
 <h2>AUTHOR</h2>
     
 <p><br>The original Samba software and related utilities were created by
-Andrew Tridgell <a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>. Samba is now developed
+Andrew Tridgell <a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>. Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 <p><br>The original Samba man pages were written by Karl Auer. The man page
@@ -90,7 +90,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 <a href="ftp://ftp.icce.rug.nl/pub/unix/"><strong>ftp://ftp.icce.rug.nl/pub/unix/</strong></a>)
 and updated for the Samba2.0 release by Jeremy Allison.
-<a href="mailto:samba-bugs@samba.anu.edu.au"><em>samba-bugs@samba.anu.edu.au</em></a>.
+<a href="mailto:samba-bugs@samba.org"><em>samba-bugs@samba.org</em></a>.
 <p><br>See <a href="samba.7.html"><strong>samba (7)</strong></a> 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/samba.lsm b/docs/samba.lsm
index 36abbba769..fa10333683 100644
--- a/docs/samba.lsm
+++ b/docs/samba.lsm
@@ -7,10 +7,10 @@ Desc3        = SMB compatible clients such as WinNT, WfWg, OS/2
 Desc4        = and Pathworks. It also includes a ftp-style unix client
 Desc5        = and a netbios nameserver.
 Author       = Andrew Tridgell
-AuthorEmail  = samba-bugs@samba.anu.edu.au
+AuthorEmail  = samba-bugs@samba.org
 Maintainer   = Andrew Tridgell
-MaintEmail   = samba-bugs@samba.anu.edu.au
-Site1        = samba.anu.edu.au
+MaintEmail   = samba-bugs@samba.org
+Site1        = samba.org
 Path1        = pub/samba/
 File1        = samba-latest.tar.gz
 FileSize1    = 200K
diff --git a/docs/textdocs/Application_Serving.txt b/docs/textdocs/Application_Serving.txt
index 4b20472e9a..14a90910d7 100644
--- a/docs/textdocs/Application_Serving.txt
+++ b/docs/textdocs/Application_Serving.txt
@@ -3,7 +3,7 @@
 !==
 Contributed:	January 7, 1997
 Updated:	March 24, 1998
-Contributor:	John H Terpstra <samba-bugs@samba.anu.edu.au>
+Contributor:	John H Terpstra <samba-bugs@samba.org>
 		Copyright (C) 1997 - John H Terpstra
 Status:		Current
 
diff --git a/docs/textdocs/BROWSING-Config.txt b/docs/textdocs/BROWSING-Config.txt
index 0dfd716d9e..be48b591ab 100644
--- a/docs/textdocs/BROWSING-Config.txt
+++ b/docs/textdocs/BROWSING-Config.txt
@@ -2,7 +2,7 @@
 !== BROWSING-Config.txt for Samba release 2.0.0-beta1 13 Nov 1998
 !==
 Date:		July 5, 1998
-Contributor:	John H Terpstra <jht@samba.anu.edu.au>
+Contributor:	John H Terpstra <jht@samba.org>
 
 Subject:	Cross Subnet Browsing / Cross Workgroup Browsing
 ===============================================================================
diff --git a/docs/textdocs/BUGS.txt b/docs/textdocs/BUGS.txt
index 0a242d4aa4..c681f61204 100644
--- a/docs/textdocs/BUGS.txt
+++ b/docs/textdocs/BUGS.txt
@@ -7,7 +7,7 @@ Updated:	June 27, 1997
 Subject: This file describes how to report Samba bugs. 
 ============================================================================
 
->> The email address for bug reports is samba-bugs@samba.anu.edu.au <<
+>> The email address for bug reports is samba-bugs@samba.org <<
 
 Please take the time to read this file before you submit a bug
 report. Also, please see if it has changed between releases, as we
@@ -28,7 +28,7 @@ that list that may be able to help you.
 
 You may also like to look though the recent mailing list archives,
 which are conveniently accessible on the Samba web pages
-at http://samba.anu.edu.au/samba/ 
+at http://samba.org/samba/ 
 
 
 GENERAL INFO
diff --git a/docs/textdocs/CVS_ACCESS.txt b/docs/textdocs/CVS_ACCESS.txt
index a1ab42e70c..d60703cfc6 100644
--- a/docs/textdocs/CVS_ACCESS.txt
+++ b/docs/textdocs/CVS_ACCESS.txt
@@ -8,10 +8,10 @@ Status:         Current
 How to get access to Samba source code via cvs.
 ===============================================
 
-CVS Access to samba.anu.edu.au
+CVS Access to samba.org
 ------------------------------
 
-The machine samba.anu.edu.au runs a publicly accessible CVS 
+The machine samba.org runs a publicly accessible CVS 
 repository for access to the source code of several packages, 
 including samba, rsync and jitterbug. This document describes 
 how to get anonymous read-only access to this source code. 
@@ -25,7 +25,7 @@ the repository and also to look at the revision history and
 commit logs of individual files. You can also ask for a diff 
 listing between any two versions on the repository.
 
-Use the URL : http://samba.anu.edu.au/cgi-bin/cvsweb
+Use the URL : http://samba.org/cgi-bin/cvsweb
 
 Access via cvs
 --------------
@@ -55,14 +55,14 @@ on this system just substitute the correct package name
 
 2. Run the command 
 
-  cvs -d :pserver:cvs@samba.anu.edu.au:/cvsroot login
+  cvs -d :pserver:cvs@samba.org:/cvsroot login
 
 When it asks you for a password type 'cvs' (not including
 the quotes).
 
 3. Run the command 
 
-  cvs -d :pserver:cvs@samba.anu.edu.au:/cvsroot co samba
+  cvs -d :pserver:cvs@samba.org:/cvsroot co samba
 
 This will create a directory called samba containing the 
 latest samba source code. This currently corresponds to the 
@@ -76,7 +76,7 @@ the following command from within the samba directory:
 NOTE: If you instead want the latest source code for the 
 1.9.17 stable tree then replace step 4 with the command: 
 
-  cvs -d :pserver:cvs@samba.anu.edu.au:/cvsroot co -r BRANCH_1_9_17 samba
+  cvs -d :pserver:cvs@samba.org:/cvsroot co -r BRANCH_1_9_17 samba
 
 Access to the NT DOMAIN Controller code
 ---------------------------------------
@@ -87,14 +87,14 @@ source code (this changes daily) do the following:
 
 1). Log onto cvs 
 
-  cvs -d :pserver:cvs@samba.anu.edu.au:/cvsroot login          
+  cvs -d :pserver:cvs@samba.org:/cvsroot login          
   
 When it asks you for a password type 'cvs' (not including
 the quotes).
 
 2). Check out the BRANCH_NTDOM by typing :
 
-  cvs -d :pserver:cvs@samba.anu.edu.au:/cvsroot co -r BRANCH_NTDOM samba
+  cvs -d :pserver:cvs@samba.org:/cvsroot co -r BRANCH_NTDOM samba
 
 This will create a directory called samba containing the
 latest snapshot of the domain controller code.
@@ -112,7 +112,7 @@ If you are interested in how anonymous cvs access is set up and
 want to set it up on your own system then you might like to checkout 
 the pserver source code using the the command :
 
- cvs -d :pserver:cvs@samba.anu.edu.au:/cvsroot co pserver
+ cvs -d :pserver:cvs@samba.org:/cvsroot co pserver
 
 You really have to know what you are doing to do this. Please don't 
 email samba-bugs with basic cvs or unix security questions. 
@@ -121,4 +121,4 @@ Reporting problems.
 -------------------
 
 If you have any problems with this system please email 
-samba-bugs@samba.anu.edu.au. 
+samba-bugs@samba.org. 
diff --git a/docs/textdocs/DHCP-Server-Configuration.txt b/docs/textdocs/DHCP-Server-Configuration.txt
index 6e2e76c64f..74cf0a84c3 100644
--- a/docs/textdocs/DHCP-Server-Configuration.txt
+++ b/docs/textdocs/DHCP-Server-Configuration.txt
@@ -3,7 +3,7 @@
 !==
 Subject:	DHCP Server Configuration for SMB Clients
 Date:		March 1, 1998
-Contributor:	John H Terpstra <jht@samba.anu.edu.au>
+Contributor:	John H Terpstra <jht@samba.org>
 Support:	This is an unsupported document. Refer to documentation that is
 		supplied with the ISC DHCP Server. Do NOT email the contributor
 		for ANY assistance.
diff --git a/docs/textdocs/DIAGNOSIS.txt b/docs/textdocs/DIAGNOSIS.txt
index 2d8e50fcec..38d5b8cd99 100644
--- a/docs/textdocs/DIAGNOSIS.txt
+++ b/docs/textdocs/DIAGNOSIS.txt
@@ -17,7 +17,7 @@ carefully choose them so later tests only use capabilities verified in
 the earlier tests.
 
 I would welcome additions to this set of tests. Please mail them to
-samba-bugs@samba.anu.edu.au
+samba-bugs@samba.org
 
 If you send me an email saying "it doesn't work" and you have not
 followed this test procedure then you should not be surprised if I
@@ -292,9 +292,9 @@ Still having troubles?
 
 Try the mailing list or newsgroup, or use the tcpdump-smb utility to
 sniff the problem. The official samba mailing list can be reached at
-samba@samba.anu.edu.au. To find out more about samba and how to
+samba@samba.org. To find out more about samba and how to
 subscribe to the mailing list check out the samba web page at
-              http://samba.anu.edu.au/samba
+              http://samba.org/samba
 
 Also look at the other docs in the Samba package!
 
diff --git a/docs/textdocs/DOMAIN_CONTROL.txt b/docs/textdocs/DOMAIN_CONTROL.txt
index 332c70caf5..6e5e7f3e76 100644
--- a/docs/textdocs/DOMAIN_CONTROL.txt
+++ b/docs/textdocs/DOMAIN_CONTROL.txt
@@ -2,7 +2,7 @@
 !== DOMAIN_CONTROL.txt for Samba release 2.0.0-beta1 13 Nov 1998
 !==
 Initial Release:	August 22, 1996
-Contributor:		John H Terpstra <samba-bugs@samba.anu.edu.au>
+Contributor:		John H Terpstra <samba-bugs@samba.org>
 			Copyright (C) 1996-1997 - John H Terpstra
 Updated:		July 5, 1998
 Status:			Current
diff --git a/docs/textdocs/ENCRYPTION.txt b/docs/textdocs/ENCRYPTION.txt
index ecf0a2e392..42397d9e0d 100644
--- a/docs/textdocs/ENCRYPTION.txt
+++ b/docs/textdocs/ENCRYPTION.txt
@@ -1,7 +1,7 @@
 !==
 !== ENCRYPTION.txt for Samba release 2.0.0-beta1 13 Nov 1998
 !==
-Contributor:	Jeremy Allison <samba-bugs@samba.anu.edu.au>
+Contributor:	Jeremy Allison <samba-bugs@samba.org>
 Updated:	March 19, 1998
 Note:		Please refer to WinNT.txt also
 
diff --git a/docs/textdocs/HINTS.txt b/docs/textdocs/HINTS.txt
index 8cdd1107eb..74eefe6ea1 100644
--- a/docs/textdocs/HINTS.txt
+++ b/docs/textdocs/HINTS.txt
@@ -50,7 +50,7 @@ Jim barry has written an excellent drag-and-drop cr/lf converter for
 windows. Just drag your file onto the icon and it converts the file.
 
 Get it from
-ftp://samba.anu.edu.au/pub/samba/contributed/fixcrlf.zip
+ftp://samba.org/pub/samba/contributed/fixcrlf.zip
 
 ---------------------- 
 HINT: Use the "username map" option
diff --git a/docs/textdocs/MIRRORS.txt b/docs/textdocs/MIRRORS.txt
index 41e89ed8c3..88ef2e7d04 100755
--- a/docs/textdocs/MIRRORS.txt
+++ b/docs/textdocs/MIRRORS.txt
@@ -3,4 +3,4 @@
 !==
 
 For a list of web and ftp mirrors please see 
-http://samba.anu.edu.au/samba/
+http://samba.org/samba/
diff --git a/docs/textdocs/NTDOMAIN.txt b/docs/textdocs/NTDOMAIN.txt
index 91417186ba..48dcabc82d 100644
--- a/docs/textdocs/NTDOMAIN.txt
+++ b/docs/textdocs/NTDOMAIN.txt
@@ -1,7 +1,7 @@
 !==
 !== NTDOMAIN.txt for Samba release 2.0.0-beta1 13 Nov 1998
 !==
-Contributor:	Luke Kenneth Casson Leighton (samba-bugs@samba.anu.edu.au)
+Contributor:	Luke Kenneth Casson Leighton (samba-bugs@samba.org)
 		Copyright (C) 1997 Luke Kenneth Casson Leighton
 Created:	October 20, 1997
 Updated:	October 29, 1997
@@ -42,7 +42,7 @@ This *has* been reported to the NTBUGTRAQ@LISTSERV.NTBUGTRAQ.COM digest.
 Domain Logons using latest cvs source
 =====================================
 
-1) obtain and compile samba: see http://samba.anu.edu.au/cvs.html
+1) obtain and compile samba: see http://samba.org/cvs.html
 
 2) set up samba with encrypted passwords: see ENCRYPTION.txt (probably out
    of date: you no longer need the DES libraries, but other than that,
@@ -143,7 +143,7 @@ Domain Logons using latest cvs source
    (generating an LSA_SAM_LOGOFF) and log back in again.  Try logging in
    two users simultaneously.  Try logging the same user in twice.
    Make Samba fall over, and then send bug reports to us, with NTDOM: at
-   the start of the subject line, as "samba-bugs@samba.anu.edu.au".
+   the start of the subject line, as "samba-bugs@samba.org".
 
 Your reports, testing, patches, criticism and encouragement will help us
 get this right.
diff --git a/docs/textdocs/PROFILES.txt b/docs/textdocs/PROFILES.txt
index a6e524036e..76dadf9b01 100644
--- a/docs/textdocs/PROFILES.txt
+++ b/docs/textdocs/PROFILES.txt
@@ -4,7 +4,7 @@
 Contributors:	Bruce Cook <BC3-AU@bigfoot.com>
 		Copyright (C) 1998 Bruce Cook
 
-		John Terpstra <samba-bugs@samba.anu.edu.au>
+		John Terpstra <samba-bugs@samba.org>
 		Copyright (C) 1998 John H. Terpstra
 
 		Wolfgang Ratzka <ratzka@hrz.uni-marburg.de>
@@ -19,7 +19,7 @@ Subject:	User Profiles
 From BC3-AU@bigfoot.com Sat Apr 11 13:36:05 1998
 Date: Sat, 11 Apr 1998 17:13:49 +1000
 From: Bruce Cook <BC3-AU@bigfoot.com>
-To: Multiple recipients of list <samba-ntdom@samba.anu.edu.au>
+To: Multiple recipients of list <samba-ntdom@samba.org>
 Subject: RE: A question about NT Domains
 
 Luke Kenneth Casson Leighton writes:
@@ -121,7 +121,7 @@ machine.
 [lkcl: nt workstations should look in exactly the same places for things on
        samba or other SMB servers as they do on an NT server, as long as that
        SMB server looks like NT.  if anyone finds that something fails, alert
-       us on samba-bugs@samba.anu.edu.au and we'll look into it].
+       us on samba-bugs@samba.org and we'll look into it].
 
    When an NT system find a user without a NTuser.DAT, it copies from a
    prototype that it stores especially for this purpose, so while unlike '95
@@ -208,7 +208,7 @@ To sum up:
 From samba@aquasoft.com.au Sat Apr 11 13:48:54 1998
 Date: Sat, 11 Apr 1998 09:34:08 +1000
 From: Samba Bugs <samba@aquasoft.com.au>
-To: Multiple recipients of list <samba-ntdom@samba.anu.edu.au>
+To: Multiple recipients of list <samba-ntdom@samba.org>
 Subject: Re: A question about NT Domains
 
 Just for the sake of completeness I thought I'd add a bit to this.
diff --git a/docs/textdocs/PROJECTS b/docs/textdocs/PROJECTS
index 07f82c74d9..3008bea430 100644
--- a/docs/textdocs/PROJECTS
+++ b/docs/textdocs/PROJECTS
@@ -14,14 +14,14 @@ then please let me know! Also, if you are listed below and you have
 any corrections or updates then please let me know.
 
 Email contact:
-samba-bugs@samba.anu.edu.au
+samba-bugs@samba.org
 
 ========================================================================
 Documentation and FAQ
 
 Docs and FAQ files for the Samba suite of software.
 
-Contact samba-bugs@samba.anu.edu.au with the diffs. These are urgently 
+Contact samba-bugs@samba.org with the diffs. These are urgently 
 required. 
 
 The FAQ is being added to on an ad hoc basis, see the web pages for info.
diff --git a/docs/textdocs/Printing.txt b/docs/textdocs/Printing.txt
index bced85f17e..33220ae916 100644
--- a/docs/textdocs/Printing.txt
+++ b/docs/textdocs/Printing.txt
@@ -1,7 +1,7 @@
 !==
 !== Printing.txt for Samba release 2.0.0-beta1 13 Nov 1998
 !==
-Contributor:	Unknown <samba-bugs@samba.anu.edu.au>
+Contributor:	Unknown <samba-bugs@samba.org>
 Date:		Unknown
 Status:		Current
 
@@ -13,7 +13,7 @@ Samba. This describes how to debug problems with printing from a SMB
 client to a Samba server, not the other way around. For the reverse
 see the examples/printing directory.
 
-Please send enhancements to this file to samba-bugs@samba.anu.edu.au
+Please send enhancements to this file to samba-bugs@samba.org
 
 Ok, so you want to print to a Samba server from your PC. The first
 thing you need to understand is that Samba does not actually do any
diff --git a/docs/textdocs/Recent-FAQs.txt b/docs/textdocs/Recent-FAQs.txt
index 26bfb0653f..0c00ffaf82 100644
--- a/docs/textdocs/Recent-FAQs.txt
+++ b/docs/textdocs/Recent-FAQs.txt
@@ -1,7 +1,7 @@
 !==
 !== Recent-FAQs.txt for Samba release 2.0.0-beta1 13 Nov 1998
 !==
-Contributor:	Samba-bugs@samba.anu.edu.au
+Contributor:	Samba-bugs@samba.org
 Date:		July 5, 1998
 Status:		Current
 
diff --git a/docs/textdocs/Support.txt b/docs/textdocs/Support.txt
index 531bb7838e..2414b3e61b 100644
--- a/docs/textdocs/Support.txt
+++ b/docs/textdocs/Support.txt
@@ -2,4 +2,4 @@ The Samba Consultants List
 ==========================
 
 This list has now moved to the support page of the 
-Samba web pages at http://samba.anu.edu.au/samba/
+Samba web pages at http://samba.org/samba/
diff --git a/docs/textdocs/Tracing.txt b/docs/textdocs/Tracing.txt
index 69081a4e24..35cd4615d7 100644
--- a/docs/textdocs/Tracing.txt
+++ b/docs/textdocs/Tracing.txt
@@ -1,7 +1,7 @@
 !==
 !== Tracing.txt for Samba release 2.0.0-beta1 13 Nov 1998
 !==
-Contributor:	Andrew Tridgell <samba-bugs@samba.anu.edu.au>
+Contributor:	Andrew Tridgell <samba-bugs@samba.org>
 Date:		Old
 Status:		Questionable
 
@@ -93,4 +93,4 @@ read-only. Both fail. This means /dev/null has incorrect permissions.
 
 Have fun!
 
-(please send updates/fixes to this file to samba-bugs@samba.anu.edu.au)
+(please send updates/fixes to this file to samba-bugs@samba.org)
diff --git a/docs/textdocs/UNIX-SMB.txt b/docs/textdocs/UNIX-SMB.txt
index 41210ab9ea..37e4157c4c 100644
--- a/docs/textdocs/UNIX-SMB.txt
+++ b/docs/textdocs/UNIX-SMB.txt
@@ -1,7 +1,7 @@
 !==
 !== UNIX-SMB.txt for Samba release 2.0.0-beta1 13 Nov 1998
 !==
-Contributor:	Andrew Tridgell <samba-bugs@samba.anu.edu.au>
+Contributor:	Andrew Tridgell <samba-bugs@samba.org>
 Date:		April 1995
 
 Subject:	Discussion of NetBIOS in a Unix World
diff --git a/docs/textdocs/UNIX_INSTALL.txt b/docs/textdocs/UNIX_INSTALL.txt
index abcd335b42..43ffc709eb 100644
--- a/docs/textdocs/UNIX_INSTALL.txt
+++ b/docs/textdocs/UNIX_INSTALL.txt
@@ -1,10 +1,10 @@
 !==
 !== UNIX_INSTALL.txt for Samba release 2.0.0-beta1 13 Nov 1998
 !==
-Contributor:	Andrew Tridgell <samba-bugs@samba.anu.edu.au>
+Contributor:	Andrew Tridgell <samba-bugs@samba.org>
 Date:		Unknown
 Status:		Current
-Updated:	November 13, 1998	<jra@samba.anu.edu.au>
+Updated:	November 13, 1998	<jra@samba.org>
 
 Subject:	HOW TO INSTALL AND TEST SAMBA
 ===============================================================================
@@ -17,7 +17,7 @@ try something like:
 	nroff -man smbd.8 | more
 
 Other sources of information are pointed to by the Samba web 
-site, http://samba.anu.edu.au/samba.
+site, http://samba.org/samba.
 
 STEP 1. Building the binaries
 
diff --git a/docs/textdocs/UNIX_SECURITY.txt b/docs/textdocs/UNIX_SECURITY.txt
index e3f31a7162..f17672f738 100644
--- a/docs/textdocs/UNIX_SECURITY.txt
+++ b/docs/textdocs/UNIX_SECURITY.txt
@@ -1,7 +1,7 @@
 !==
 !== UNIX_SECURITY.txt for Samba release 2.0.0-beta1 13 Nov 1998
 !==
-Contributor:	John H Terpstra <jht@samba.anu.edu.au>
+Contributor:	John H Terpstra <jht@samba.org>
 Date:		July 5, 1998
 Status:		Current
 
diff --git a/docs/textdocs/cifsntdomain.txt b/docs/textdocs/cifsntdomain.txt
index ba6b9d6baf..a5f90039ea 100644
--- a/docs/textdocs/cifsntdomain.txt
+++ b/docs/textdocs/cifsntdomain.txt
@@ -153,7 +153,7 @@ http://mailhost.cb1.com/~lkcl/crypt.html
 A c-code implementation, provided by Linus Nordberg <linus@incolumitas.se>
 of this protocol is available from:
 
-http://samba.anu.edu.au/cgi-bin/mfs/01/digest/1997/97aug/0391.html
+http://samba.org/cgi-bin/mfs/01/digest/1997/97aug/0391.html
 http://mailhost.cb1.com/~lkcl/crypt.txt
 
 
diff --git a/docs/yodldocs/DOMAIN_MEMBER.yo b/docs/yodldocs/DOMAIN_MEMBER.yo
index 9b9c37ac1c..2b05c0e814 100644
--- a/docs/yodldocs/DOMAIN_MEMBER.yo
+++ b/docs/yodldocs/DOMAIN_MEMBER.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au)
+mailto(samba-bugs@samba.org)
 
 article(Joining an NT Domain with Samba 2.0)(Jeremy Allison, Samba Team)(11th November 1998)
 
diff --git a/docs/yodldocs/lmhosts.5.yo b/docs/yodldocs/lmhosts.5.yo
index ceb217ddb2..a48dedaca8 100644
--- a/docs/yodldocs/lmhosts.5.yo
+++ b/docs/yodldocs/lmhosts.5.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au)
+mailto(samba-bugs@samba.org)
 
 manpage(lmhosts htmlcommand((5)))(5)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -78,7 +78,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -87,7 +87,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/make_smbcodepage.1.yo b/docs/yodldocs/make_smbcodepage.1.yo
index 73483689d2..8ef39e5493 100644
--- a/docs/yodldocs/make_smbcodepage.1.yo
+++ b/docs/yodldocs/make_smbcodepage.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(make_smbcodepage htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -69,7 +69,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 email(samba-bugs@samba.anu.edu.au). All codepage files in the
+them to email(samba-bugs@samba.org). All codepage files in the
 Samba em(source/codepages) directory are compiled and installed when a
 em('make install') command is issued there.
 
@@ -139,7 +139,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -148,7 +148,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/nmbd.8.yo b/docs/yodldocs/nmbd.8.yo
index c0949d2677..bf9a5f8b78 100644
--- a/docs/yodldocs/nmbd.8.yo
+++ b/docs/yodldocs/nmbd.8.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(nmbd)(8)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -215,13 +215,13 @@ url(bf(testparm (1)))(testparm.1.html), url(bf(testprns
 (1)))(testprns.1.html), and the Internet RFC's bf(rfc1001.txt),
 bf(rfc1002.txt). In addition the CIFS (formerly SMB) specification is
 available as a link from the Web page :
-url(http://samba.anu.edu.au/cifs/)(http://samba.anu.edu.au/cifs/).
+url(http://samba.org/cifs/)(http://samba.org/cifs/).
 
 label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -230,7 +230,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/nmblookup.1.yo b/docs/yodldocs/nmblookup.1.yo
index 98de643fd0..6293fd01e5 100644
--- a/docs/yodldocs/nmblookup.1.yo
+++ b/docs/yodldocs/nmblookup.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(nmblookup htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -123,9 +123,9 @@ tt(nmblookup -U server -R 'name')
 
 For example, running :
 
-tt(nmblookup -U samba.anu.edu.au -R IRIX#1B')
+tt(nmblookup -U samba.org -R IRIX#1B')
 
-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.
 
 label(VERSION)
@@ -143,7 +143,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -152,7 +152,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/samba.7.yo b/docs/yodldocs/samba.7.yo
index 3951d13fa8..dc238bd0fc 100644
--- a/docs/yodldocs/samba.7.yo
+++ b/docs/yodldocs/samba.7.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au)
+mailto(samba-bugs@samba.org)
 manpage(Samba htmlcommand((7)))(7)(23 Oct 1998)(Samba)()
 
 label(NAME)
@@ -25,7 +25,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 email(samba-bugs@samba.anu.edu.au).
+to email(samba-bugs@samba.org).
 
 startdit() 
 
@@ -83,7 +83,7 @@ file COPYING. You are encouraged to distribute copies of the Samba
 suite, but please obey the terms of this license.
 
 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.
 
 You may also find useful information about Samba on the newsgroup
@@ -93,7 +93,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
-url(http://samba.anu.edu.au/samba/)(http://samba.anu.edu.au/samba/).
+url(http://samba.org/samba/)(http://samba.org/samba/).
 
 label(VERSION)
 manpagesection(VERSION)
@@ -104,13 +104,13 @@ label(CONTRIBUTIONS)
 manpagesection(CONTRIBUTIONS)
 
 If you wish to contribute to the Samba project, then I suggest you
-join the Samba mailing list at email(samba@samba.anu.edu.au). See the
+join the Samba mailing list at email(samba@samba.org). See the
 Web page at
-url(http://samba.anu.edu.au/listproc)(http://samba.anu.edu.au/listproc)
+url(http://samba.org/listproc)(http://samba.org/listproc)
 for details on how to do this.
 
 If you have patches to submit or bugs to report then you may mail them
-directly to email(samba-bugs@samba.anu.edu.au). Note, however, that due to
+directly to email(samba-bugs@samba.org). 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 em(diff -u) format.
 
@@ -119,22 +119,22 @@ manpagesection(CREDITS)
 
 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
-url(ftp://samba.anu.edu.au/pub/samba/alpha/change-log)(ftp://samba.anu.edu.au/pub/samba/alpha/change-log)
+url(ftp://samba.org/pub/samba/alpha/change-log)(ftp://samba.org/pub/samba/alpha/change-log)
 for the pre-CVS changes and at
-url(ftp://samba.anu.edu.au/pub/samba/alpha/cvs.log)(ftp://samba.anu.edu.au/pub/samba/alpha/cvs.log)
+url(ftp://samba.org/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.
 
 In addition, several commercial organizations now help fund the Samba
 Team with money and equipment. For details see the Samba Web pages at
-url(http://samba.anu.edu.au/samba/samba-thanks.html)(http://samba.anu.edu.au/samba/samba-thanks.html).
+url(http://samba.org/samba/samba-thanks.html)(http://samba.org/samba/samba-thanks.html).
 
 label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -143,4 +143,4 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
diff --git a/docs/yodldocs/smb.conf.5.yo b/docs/yodldocs/smb.conf.5.yo
index 809e9d17a6..12ae4242e0 100644
--- a/docs/yodldocs/smb.conf.5.yo
+++ b/docs/yodldocs/smb.conf.5.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(smb.conf htmlcommand((5)))(5)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -361,7 +361,7 @@ it() bf(%a) = the architecture of the remote
 machine. Only some are recognized, and those may not be 100%
 reliable. It currently recognizes Samba, WfWg, WinNT and
 Win95. Anything else will be known as "UNKNOWN". If it gets it wrong
-then sending a level 3 log to email(samba-bugs@samba.anu.edu.au)
+then sending a level 3 log to email(samba-bugs@samba.org)
 should allow it to be fixed.
 
 label(percentI)
@@ -1776,7 +1776,7 @@ Samba NT Domain Controller Code. It may be removed in a later release.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list bf(Samba-ntdom) available by sending email to
-email(listproc@samba.anu.edu.au)
+email(listproc@samba.org)
 
 label(domainadminusers) 
 dit(bf(domain admin users (G)))
@@ -1786,7 +1786,7 @@ Samba NT Domain Controller Code. It may be removed in a later release.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list bf(Samba-ntdom) available by sending email to
-email(listproc@samba.anu.edu.au)
+email(listproc@samba.org)
 
 label(domain controller)
 dit(bf(domain controller (G)))
@@ -1803,7 +1803,7 @@ Samba NT Domain Controller Code. It may be removed in a later release.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list bf(Samba-ntdom) available by sending email to
-email(listproc@samba.anu.edu.au)
+email(listproc@samba.org)
 
 label(domainguestgroup)
 dit(bf(domain guest group (G)))
@@ -1813,7 +1813,7 @@ Samba NT Domain Controller Code. It may be removed in a later release.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list bf(Samba-ntdom) available by sending email to
-email(listproc@samba.anu.edu.au)
+email(listproc@samba.org)
 
 label(domainguestusers)
 dit(bf(domain guest users (G)))
@@ -1823,7 +1823,7 @@ Samba NT Domain Controller Code. It may be removed in a later release.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list bf(Samba-ntdom) available by sending email to
-email(listproc@samba.anu.edu.au)
+email(listproc@samba.org)
 
 label(domainlogons)
 dit(bf(domain logons (G)))
@@ -5017,7 +5017,7 @@ You may find that on some systems Samba will say "Unknown socket
 option" when you supply an option. This means you either incorrectly 
 typed it or you need to add an include file to includes.h for your OS. 
 If the latter is the case please send the patch to
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 Any of the supported socket options may be combined in any way you
 like, as long as your OS allows it.
@@ -6114,7 +6114,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -6123,7 +6123,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbclient.1.yo b/docs/yodldocs/smbclient.1.yo
index e332f82556..327e47c7a2 100644
--- a/docs/yodldocs/smbclient.1.yo
+++ b/docs/yodldocs/smbclient.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(smbclient htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -728,7 +728,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -737,7 +737,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbd.8.yo b/docs/yodldocs/smbd.8.yo
index eded744ad2..acd2639a26 100644
--- a/docs/yodldocs/smbd.8.yo
+++ b/docs/yodldocs/smbd.8.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(smbd htmlcommand((8)))(8)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -427,13 +427,13 @@ url(bf(smb.conf (5)))(smb.conf.5.html), url(bf(smbclient
 url(bf(testprns (1)))(testprns.1.html), and the Internet RFC's
 bf(rfc1001.txt), bf(rfc1002.txt). In addition the CIFS (formerly SMB)
 specification is available as a link from the Web page :
-url(http://samba.anu.edu.au/cifs/)(http://samba.anu.edu.au/cifs/).
+url(http://samba.org/cifs/)(http://samba.org/cifs/).
 
 label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -442,7 +442,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) 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/yodldocs/smbpasswd.5.yo b/docs/yodldocs/smbpasswd.5.yo
index 2dc8458013..8918b24835 100644
--- a/docs/yodldocs/smbpasswd.5.yo
+++ b/docs/yodldocs/smbpasswd.5.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(smbpasswd htmlcommand((5)))(5)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -197,7 +197,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -206,7 +206,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/)) 
 and updated for the Samba2.0 release by Jeremy
-Allison, email(samba-bugs@samba.anu.edu.au).
+Allison, email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbpasswd.8.yo b/docs/yodldocs/smbpasswd.8.yo
index b32a65a129..9e7c401fcf 100644
--- a/docs/yodldocs/smbpasswd.8.yo
+++ b/docs/yodldocs/smbpasswd.8.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(smbpasswd htmlcommand((8)))(8)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -207,7 +207,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
-email(samba-ntdom@samba.anu.edu.au).
+email(samba-ntdom@samba.org).
 
 This option is only available when running bf(smbpasswd) as root.
 
@@ -296,7 +296,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -305,7 +305,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbrun.1.yo b/docs/yodldocs/smbrun.1.yo
index d8e05c6e09..97865e9826 100644
--- a/docs/yodldocs/smbrun.1.yo
+++ b/docs/yodldocs/smbrun.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(smbrun htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -65,7 +65,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -74,7 +74,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbstatus.1.yo b/docs/yodldocs/smbstatus.1.yo
index 0312cdb251..9429811c7d 100644
--- a/docs/yodldocs/smbstatus.1.yo
+++ b/docs/yodldocs/smbstatus.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(smbstatus htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -65,7 +65,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -74,7 +74,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbtar.1.yo b/docs/yodldocs/smbtar.1.yo
index d35cea6939..217d8d1926 100644
--- a/docs/yodldocs/smbtar.1.yo
+++ b/docs/yodldocs/smbtar.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(smbtar htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -119,7 +119,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -131,7 +131,7 @@ etc. The man page sources were converted to YODL format (another
 excellent piece of Open Source software available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison,
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
  
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/swat.8.yo b/docs/yodldocs/swat.8.yo
index 81719f5ccd..5059e3f47c 100644
--- a/docs/yodldocs/swat.8.yo
+++ b/docs/yodldocs/swat.8.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(swat htmlcommand((8)))(8)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -146,7 +146,7 @@ label(AUTHOR)
 manpageauthor()
 
 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.
 
@@ -155,7 +155,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/testparm.1.yo b/docs/yodldocs/testparm.1.yo
index 1c463a5ee4..2c8e414bcd 100644
--- a/docs/yodldocs/testparm.1.yo
+++ b/docs/yodldocs/testparm.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(testparm htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -88,7 +88,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -97,7 +97,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/testprns.1.yo b/docs/yodldocs/testprns.1.yo
index 8ec0410426..a29cd0dd85 100644
--- a/docs/yodldocs/testprns.1.yo
+++ b/docs/yodldocs/testprns.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.anu.edu.au) 
+mailto(samba-bugs@samba.org) 
 
 manpage(testprns htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -82,7 +82,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.anu.edu.au). Samba is now developed
+Andrew Tridgell email(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.
 
@@ -91,7 +91,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.anu.edu.au).
+email(samba-bugs@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,