diff --git a/README b/README
index 32b21ec..3cb204e 100644
--- a/README
+++ b/README
@@ -96,5 +96,5 @@
 
 
 Julian Seward (jseward@acm.org)
-Nick Nethercote (njn25@cam.ac.uk)
+Nick Nethercote (njn@valgrind.org)
 Jeremy Fitzhardinge (jeremy@goop.org)
diff --git a/cachegrind/amd64/cg_arch.c b/cachegrind/amd64/cg_arch.c
index b82c4e2..0c738b8 100644
--- a/cachegrind/amd64/cg_arch.c
+++ b/cachegrind/amd64/cg_arch.c
@@ -8,7 +8,7 @@
    profiling programs.
 
    Copyright (C) 2002-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/cachegrind/arm/cg_arch.c b/cachegrind/arm/cg_arch.c
index 44d3528..9800069 100644
--- a/cachegrind/arm/cg_arch.c
+++ b/cachegrind/arm/cg_arch.c
@@ -8,7 +8,7 @@
    profiling programs.
 
    Copyright (C) 2002-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in
index dcc6fbf..07a5477 100644
--- a/cachegrind/cg_annotate.in
+++ b/cachegrind/cg_annotate.in
@@ -10,7 +10,7 @@
 #  profiling programs.
 #
 #  Copyright (C) 2002-2005 Nicholas Nethercote
-#     njn25@cam.ac.uk
+#     njn@valgrind.org
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License as
diff --git a/cachegrind/cg_arch.h b/cachegrind/cg_arch.h
index 991ea9f..200234f 100644
--- a/cachegrind/cg_arch.h
+++ b/cachegrind/cg_arch.h
@@ -8,7 +8,7 @@
    profiling programs.
 
    Copyright (C) 2002-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/cachegrind/cg_main.c b/cachegrind/cg_main.c
index 6400205..3cea6e2 100644
--- a/cachegrind/cg_main.c
+++ b/cachegrind/cg_main.c
@@ -9,7 +9,7 @@
    profiling programs.
 
    Copyright (C) 2002-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/cachegrind/cg_sim.c b/cachegrind/cg_sim.c
index 8fc2507..36b449b 100644
--- a/cachegrind/cg_sim.c
+++ b/cachegrind/cg_sim.c
@@ -8,7 +8,7 @@
    profiling programs.
 
    Copyright (C) 2002-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/cachegrind/x86/cg_arch.c b/cachegrind/x86/cg_arch.c
index 1372b66..b40ad91 100644
--- a/cachegrind/x86/cg_arch.c
+++ b/cachegrind/x86/cg_arch.c
@@ -8,7 +8,7 @@
    profiling programs.
 
    Copyright (C) 2002-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/corecheck/cc_main.c b/corecheck/cc_main.c
index 2e81a00..c7ad1a5 100644
--- a/corecheck/cc_main.c
+++ b/corecheck/cc_main.c
@@ -9,7 +9,7 @@
    detecting certain basic program errors.
 
    Copyright (C) 2002-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/amd64-linux/core_platform.h b/coregrind/amd64-linux/core_platform.h
index 9d5e4c6..1ac9f43 100644
--- a/coregrind/amd64-linux/core_platform.h
+++ b/coregrind/amd64-linux/core_platform.h
@@ -9,7 +9,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/amd64-linux/syscalls.c b/coregrind/amd64-linux/syscalls.c
index 36ff15b..f231484 100644
--- a/coregrind/amd64-linux/syscalls.c
+++ b/coregrind/amd64-linux/syscalls.c
@@ -8,7 +8,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/amd64/amd64_private.h b/coregrind/amd64/amd64_private.h
index e1ec2be..8caa7d1 100644
--- a/coregrind/amd64/amd64_private.h
+++ b/coregrind/amd64/amd64_private.h
@@ -8,7 +8,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/amd64/amd64_private_asm.h b/coregrind/amd64/amd64_private_asm.h
index 7db97c0..4f1e61a 100644
--- a/coregrind/amd64/amd64_private_asm.h
+++ b/coregrind/amd64/amd64_private_asm.h
@@ -8,7 +8,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/amd64/core_arch.h b/coregrind/amd64/core_arch.h
index 6a054a4..e23f515 100644
--- a/coregrind/amd64/core_arch.h
+++ b/coregrind/amd64/core_arch.h
@@ -8,7 +8,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/amd64/core_arch_asm.h b/coregrind/amd64/core_arch_asm.h
index 95fe0a2..d9c5a3d 100644
--- a/coregrind/amd64/core_arch_asm.h
+++ b/coregrind/amd64/core_arch_asm.h
@@ -7,7 +7,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/amd64/state.c b/coregrind/amd64/state.c
index 31c5477..1ab749f 100644
--- a/coregrind/amd64/state.c
+++ b/coregrind/amd64/state.c
@@ -8,7 +8,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/arm-linux/core_platform.h b/coregrind/arm-linux/core_platform.h
index 0630b30..db441aa 100644
--- a/coregrind/arm-linux/core_platform.h
+++ b/coregrind/arm-linux/core_platform.h
@@ -9,7 +9,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/arm-linux/syscalls.c b/coregrind/arm-linux/syscalls.c
index 0218148..0db5627 100644
--- a/coregrind/arm-linux/syscalls.c
+++ b/coregrind/arm-linux/syscalls.c
@@ -8,7 +8,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/arm/core_arch.h b/coregrind/arm/core_arch.h
index 160a50c..d20f10a 100644
--- a/coregrind/arm/core_arch.h
+++ b/coregrind/arm/core_arch.h
@@ -8,7 +8,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/arm/core_arch_asm.h b/coregrind/arm/core_arch_asm.h
index 184a4e1..2d990c4 100644
--- a/coregrind/arm/core_arch_asm.h
+++ b/coregrind/arm/core_arch_asm.h
@@ -7,7 +7,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/arm/state.c b/coregrind/arm/state.c
index ab5df85..5f41c41 100644
--- a/coregrind/arm/state.c
+++ b/coregrind/arm/state.c
@@ -8,7 +8,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/linux/core_os.h b/coregrind/linux/core_os.h
index 5429993..dfc8af4 100644
--- a/coregrind/linux/core_os.h
+++ b/coregrind/linux/core_os.h
@@ -9,7 +9,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/linux/syscalls.c b/coregrind/linux/syscalls.c
index bbaff2f..a664487 100644
--- a/coregrind/linux/syscalls.c
+++ b/coregrind/linux/syscalls.c
@@ -8,7 +8,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/m_sigframe/sigframe-amd64-linux.c b/coregrind/m_sigframe/sigframe-amd64-linux.c
index fd6ceb9..622806a 100644
--- a/coregrind/m_sigframe/sigframe-amd64-linux.c
+++ b/coregrind/m_sigframe/sigframe-amd64-linux.c
@@ -9,7 +9,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/m_sigframe/sigframe-arm-linux.c b/coregrind/m_sigframe/sigframe-arm-linux.c
index c658275..49704f3 100644
--- a/coregrind/m_sigframe/sigframe-arm-linux.c
+++ b/coregrind/m_sigframe/sigframe-arm-linux.c
@@ -8,7 +8,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/m_sigframe/sigframe-x86-linux.c b/coregrind/m_sigframe/sigframe-x86-linux.c
index a7329f5..bcf2111 100644
--- a/coregrind/m_sigframe/sigframe-x86-linux.c
+++ b/coregrind/m_sigframe/sigframe-x86-linux.c
@@ -9,7 +9,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/vg_default.c b/coregrind/vg_default.c
index 5c6979c..2a751b1 100644
--- a/coregrind/vg_default.c
+++ b/coregrind/vg_default.c
@@ -10,7 +10,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/vg_needs.c b/coregrind/vg_needs.c
index a8418a8..74bc314 100644
--- a/coregrind/vg_needs.c
+++ b/coregrind/vg_needs.c
@@ -9,7 +9,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/x86-linux/core_platform.h b/coregrind/x86-linux/core_platform.h
index 350bc7c..2726a74 100644
--- a/coregrind/x86-linux/core_platform.h
+++ b/coregrind/x86-linux/core_platform.h
@@ -9,7 +9,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/x86-linux/syscalls.c b/coregrind/x86-linux/syscalls.c
index 1cb9de5..2701306 100644
--- a/coregrind/x86-linux/syscalls.c
+++ b/coregrind/x86-linux/syscalls.c
@@ -8,7 +8,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/x86/core_arch.h b/coregrind/x86/core_arch.h
index 959a7b3..4431e43 100644
--- a/coregrind/x86/core_arch.h
+++ b/coregrind/x86/core_arch.h
@@ -8,7 +8,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/x86/core_arch_asm.h b/coregrind/x86/core_arch_asm.h
index c3c2575..c8a6210 100644
--- a/coregrind/x86/core_arch_asm.h
+++ b/coregrind/x86/core_arch_asm.h
@@ -7,7 +7,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/x86/state.c b/coregrind/x86/state.c
index 9597ee5..fbd32b7 100644
--- a/coregrind/x86/state.c
+++ b/coregrind/x86/state.c
@@ -8,7 +8,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/x86/x86_private.h b/coregrind/x86/x86_private.h
index 330b079..bc62cc5 100644
--- a/coregrind/x86/x86_private.h
+++ b/coregrind/x86/x86_private.h
@@ -8,7 +8,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/coregrind/x86/x86_private_asm.h b/coregrind/x86/x86_private_asm.h
index 9fe9628..d0ca581 100644
--- a/coregrind/x86/x86_private_asm.h
+++ b/coregrind/x86/x86_private_asm.h
@@ -8,7 +8,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/helgrind/hg_main.c b/helgrind/hg_main.c
index b45d13d..d192136 100644
--- a/helgrind/hg_main.c
+++ b/helgrind/hg_main.c
@@ -9,7 +9,7 @@
    data races in threaded programs.
 
    Copyright (C) 2002-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/include/amd64/tool_arch.h b/include/amd64/tool_arch.h
index 3531fb2..c2a15db 100644
--- a/include/amd64/tool_arch.h
+++ b/include/amd64/tool_arch.h
@@ -7,7 +7,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/include/arm/tool_arch.h b/include/arm/tool_arch.h
index 6d5011e..7e3165f 100644
--- a/include/arm/tool_arch.h
+++ b/include/arm/tool_arch.h
@@ -7,7 +7,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/include/x86/tool_arch.h b/include/x86/tool_arch.h
index 1159c4f..5d042f2 100644
--- a/include/x86/tool_arch.h
+++ b/include/x86/tool_arch.h
@@ -7,7 +7,7 @@
    framework.
 
    Copyright (C) 2000-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/lackey/lk_main.c b/lackey/lk_main.c
index 6a863ff..dbeabb8 100644
--- a/lackey/lk_main.c
+++ b/lackey/lk_main.c
@@ -9,7 +9,7 @@
    some simple program measurement.
 
    Copyright (C) 2002-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/massif/ms_main.c b/massif/ms_main.c
index 1e987f3..fae3d71 100644
--- a/massif/ms_main.c
+++ b/massif/ms_main.c
@@ -8,7 +8,7 @@
    usage of programs.
 
    Copyright (C) 2003-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/none/nl_main.c b/none/nl_main.c
index c181d82..ca716e0 100644
--- a/none/nl_main.c
+++ b/none/nl_main.c
@@ -8,7 +8,7 @@
    which does nothing.
 
    Copyright (C) 2002-2005 Nicholas Nethercote
-      njn25@cam.ac.uk
+      njn@valgrind.org
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in
index dfe87f9..9c3a4d4 100755
--- a/tests/vg_regtest.in
+++ b/tests/vg_regtest.in
@@ -7,7 +7,7 @@
 #  framework.
 #
 #  Copyright (C) 2003 Nicholas Nethercote
-#     njn25@cam.ac.uk
+#     njn@valgrind.org
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License as