diff --git a/README.patches b/README.patches
index f506b0a..a33fa88 100644
--- a/README.patches
+++ b/README.patches
@@ -1,4 +1,4 @@
-Mauro Carvalho Chehab <mchehab at infradead dot org>
+Mauro Carvalho Chehab <mchehab@infradead.org>
 					Updated on 2010 January 30
 
 This file describes the general procedures used by the LinuxTV team (*)
diff --git a/build b/build
index dd83374..d67f37c 100755
--- a/build
+++ b/build
@@ -644,7 +644,7 @@ Report bugs to <linux-media@vger.kernel.org>
 
 =head1 COPYRIGHT
 
-Copyright (c) 2011 by Mauro Carvalho Chehab <mchehab@redhat.com>.
+Copyright (c) 2011 by Mauro Carvalho Chehab.
 
 License GPLv2: GNU GPL version 2 L<http://gnu.org/licenses/gpl.html>.
 
diff --git a/devel_scripts/analyze_build.pl b/devel_scripts/analyze_build.pl
index a9dc973..79258b0 100755
--- a/devel_scripts/analyze_build.pl
+++ b/devel_scripts/analyze_build.pl
@@ -287,13 +287,13 @@ patches from it.
 
 =head1 BUGS
 
-Report bugs to Mauro Carvalho Chehab <mchehab@redhat.com>
+Report bugs to <linux-media@vger.kernel.org>
 
 =head1 COPYRIGHT
 
 Copyright (c) 2006 Trent Piepho <xyzzy@speakeasy.org>
 
-Copyright (c) 2012 by Mauro Carvalho Chehab <mchehab@redhat.com>.
+Copyright (c) 2012 by Mauro Carvalho Chehab
 
 License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>.
 
diff --git a/v4l/scripts/prepare-ChangeLog.pl b/v4l/scripts/prepare-ChangeLog.pl
index 370405d..4bd2db2 100755
--- a/v4l/scripts/prepare-ChangeLog.pl
+++ b/v4l/scripts/prepare-ChangeLog.pl
@@ -8,16 +8,16 @@
 # Java support added by Maciej Stachowiak <mjs@eazel.com>
 # last updated 28 December 2000
 #
-# Mauro Carvalho Chehab <mchehab@brturbo.com.br>: modified to
+# Mauro Carvalho Chehab <mchehab@infradead.org>: modified to
 # allow signed-off-by tags, GMT Time and V4L format.
 # CHANVE_LOG Env variables now are mandatory.
 # Updated at 15 January 2005
 #
-# Mauro Carvalho Chehab <mchehab@brturbo.com.br>: modified to
+# Mauro Carvalho Chehab <mchehab@infradead.org>: modified to
 # work with Mercurial
 # Updated at 29 August 2005
 #
-# Mauro Carvalho Chehab <mchehab@brturbo.com.br>: modified to
+# Mauro Carvalho Chehab <mchehab@infradead.org>: modified to
 # just generate a changelog entry
 # Updated at 01 January 2006
 ##