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