9 files changed, 12 insertions, 12 deletions
diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index d87ae75e73..942fb8920c 100644
--- a/docs/manpages/nmbd.8
+++ b/docs/manpages/nmbd.8
@@ -210,7 +210,7 @@ these to the address below for rectification.
 .BR testprns (1)
 .SH CREDITS
 The original Samba software and related utilities were created by 
-Andrew Tridgell (samba-bugs@anu.edu.au). Andrew is also the Keeper
+Andrew Tridgell (samba-bugs@samba.anu.edu.au). Andrew is also the Keeper
 of the Source for this project.
 
 This man page was originally written by Karl Auer (Karl.Auer@anu.edu.au).
diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7
index 1621f2e68c..3dd6253ebe 100644
--- a/docs/manpages/samba.7
+++ b/docs/manpages/samba.7
@@ -69,7 +69,7 @@ of the Samba mailing list, at http://samba.canberra.edu.au/pub/samba/
 .SH AUTHOR
 
 The main author of the Samba suite is Andrew Tridgell. He may be
-contacted via e-mail at samba-bugs@anu.edu.au.
+contacted via e-mail at samba-bugs@samba.anu.edu.au.
 
 There have also been an enormous number of contributors to Samba from
 all over the world. A partial list of these contributors is included
@@ -184,7 +184,7 @@ Contributors to the project are (in alphabetical order by email address):
  S{rkel{, Vesa
  	(vesku@rankki.kcl.fi)
  Tridgell, Andrew
- 	(samba-bugs@anu.edu.au)
+ 	(samba-bugs@samba.anu.edu.au)
  Troyer, Dean
  	(troyer@saifr00.ateng.az.honeywell.com)
  Wakelin, Ross
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 2103859903..6761445b89 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -2362,7 +2362,7 @@ You may find that on some systems Samba will say "Unknown socket
 option" when you supply an option. This means you either mis-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 me
-(samba-bugs@anu.edu.au).
+(samba-bugs@samba.anu.edu.au).
 
 Any of the supported socket options may be combined in any way you
 like, as long as your OS allows it.
@@ -2864,7 +2864,7 @@ None known.
 Please send bug reports, comments and so on to:
 
 .RS 3
-.B samba-bugs@anu.edu.au (Andrew Tridgell)
+.B samba-bugs@samba.anu.edu.au (Andrew Tridgell)
 
 .RS 3
 or to the mailing list:
@@ -2887,6 +2887,6 @@ Errors or suggestions for improvements to the Samba man pages should be
 mailed to:
 
 .RS 3
-.B samba-bugs@anu.edu.au (Andrew Tridgell)
+.B samba-bugs@samba.anu.edu.au (Andrew Tridgell)
 .RE
 
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index 7482c7ca76..368c804032 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -1196,7 +1196,7 @@ diagnostics you are seeing.
 None known.
 .SH CREDITS
 The original Samba software and related utilities were created by 
-Andrew Tridgell (samba-bugs@anu.edu.au). Andrew is also the Keeper
+Andrew Tridgell (samba-bugs@samba.anu.edu.au). Andrew is also the Keeper
 of the Source for this project.
 
 This man page was written by Karl Auer (Karl.Auer@anu.edu.au).
diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index 7c513cc41e..116b24693d 100644
--- a/docs/manpages/smbd.8
+++ b/docs/manpages/smbd.8
@@ -409,7 +409,7 @@ diagnostics you are seeing.
 None known.
 .SH CREDITS
 The original Samba software and related utilities were created by 
-Andrew Tridgell (samba-bugs@anu.edu.au). Andrew is also the Keeper
+Andrew Tridgell (samba-bugs@samba.anu.edu.au). Andrew is also the Keeper
 of the Source for this project.
 
 This man page was written by Karl Auer (Karl.Auer@anu.edu.au).
diff --git a/docs/manpages/smbrun.1 b/docs/manpages/smbrun.1
index 05056e9720..3f04e3cd8b 100644
--- a/docs/manpages/smbrun.1
+++ b/docs/manpages/smbrun.1
@@ -63,7 +63,7 @@ commands to issue suitable diagnostics to aid trouble-shooting.
 None known.
 .SH CREDITS
 The original Samba software and related utilities were created by 
-Andrew Tridgell (samba-bugs@anu.edu.au). Andrew is also the Keeper
+Andrew Tridgell (samba-bugs@samba.anu.edu.au). Andrew is also the Keeper
 of the Source for this project.
 
 This man page was written by Karl Auer (Karl.Auer@anu.edu.au).
diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1
index f6716940ab..70a16afe6f 100644
--- a/docs/manpages/smbtar.1
+++ b/docs/manpages/smbtar.1
@@ -161,7 +161,7 @@ See diagnostics for
 command.
 .SH CREDITS
 The original Samba software and related utilities were created by 
-Andrew Tridgell (samba-bugs@anu.edu.au). Andrew is also the Keeper
+Andrew Tridgell (samba-bugs@samba.anu.edu.au). Andrew is also the Keeper
 of the Source for this project.
 
 Ricky Poulten (poultenr@logica.co.uk) wrote the tar extension and this
diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1
index 8deb1c38c2..a40de28611 100644
--- a/docs/manpages/testparm.1
+++ b/docs/manpages/testparm.1
@@ -95,7 +95,7 @@ Other messages are self-explanatory.
 None known.
 .SH CREDITS
 The original Samba software and related utilities were created by 
-Andrew Tridgell (samba-bugs@anu.edu.au). Andrew is also the Keeper
+Andrew Tridgell (samba-bugs@samba.anu.edu.au). Andrew is also the Keeper
 of the Source for this project.
 
 The
diff --git a/docs/manpages/testprns.1 b/docs/manpages/testprns.1
index 22e77567a7..623163ce58 100644
--- a/docs/manpages/testprns.1
+++ b/docs/manpages/testprns.1
@@ -98,7 +98,7 @@ Other messages are self-explanatory.
 None known.
 .SH CREDITS
 The original Samba software and related utilities were created by 
-Andrew Tridgell (samba-bugs@anu.edu.au). Andrew is also the Keeper
+Andrew Tridgell (samba-bugs@samba.anu.edu.au). Andrew is also the Keeper
 of the Source for this project.
 
 The