diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 53856a10352c3869ac3ebf58f62b39fe21372d38..19f348651c78f753b95ca31f12613b1d4e4d0586 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -1,6 +1,6 @@
 /*
  * MPEG-4 ALS decoder
- * Copyright (c) 2009 Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
+ * Copyright (c) 2009 Thilo Borgmann <thilo.borgmann _at_ mail.de>
  *
  * This file is part of FFmpeg.
  *
@@ -22,7 +22,7 @@
 /**
  * @file
  * MPEG-4 ALS decoder
- * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
+ * @author Thilo Borgmann <thilo.borgmann _at_ mail.de>
  */
 
 #include "avcodec.h"
diff --git a/libavcodec/bgmc.c b/libavcodec/bgmc.c
index 40e7d15dcc07e907a507590def1cb99479e3ba75..1a6817b73f7b3fb895c40d9a24a3902f0513fcc2 100644
--- a/libavcodec/bgmc.c
+++ b/libavcodec/bgmc.c
@@ -1,6 +1,6 @@
 /*
  * Block Gilbert-Moore decoder
- * Copyright (c) 2010 Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
+ * Copyright (c) 2010 Thilo Borgmann <thilo.borgmann _at_ mail.de>
  *
  * This file is part of FFmpeg.
  *
@@ -22,7 +22,7 @@
 /**
  * @file
  * Block Gilbert-Moore decoder as used by MPEG-4 ALS
- * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
+ * @author Thilo Borgmann <thilo.borgmann _at_ mail.de>
  */
 
 #include "libavutil/attributes.h"
diff --git a/libavcodec/bgmc.h b/libavcodec/bgmc.h
index 9e386fdbddd4a38689738370e53c3ae497e8b1b9..4893736af5a35694e1e1d2ea2a64f8804c10f51d 100644
--- a/libavcodec/bgmc.h
+++ b/libavcodec/bgmc.h
@@ -1,6 +1,6 @@
 /*
  * Block Gilbert-Moore decoder
- * Copyright (c) 2010 Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
+ * Copyright (c) 2010 Thilo Borgmann <thilo.borgmann _at_ mail.de>
  *
  * This file is part of FFmpeg.
  *
@@ -22,7 +22,7 @@
 /**
  * @file
  * Block Gilbert-Moore decoder header
- * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
+ * @author Thilo Borgmann <thilo.borgmann _at_ mail.de>
  */
 
 
diff --git a/libavcodec/exif.c b/libavcodec/exif.c
index 90a058621b564a54cd70e62107045827b40ef7ed..ec524a5943ff5cbd90ac0d2c7748c05a0d728f03 100644
--- a/libavcodec/exif.c
+++ b/libavcodec/exif.c
@@ -1,6 +1,6 @@
 /*
  * EXIF metadata parser
- * Copyright (c) 2013 Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
+ * Copyright (c) 2013 Thilo Borgmann <thilo.borgmann _at_ mail.de>
  *
  * This file is part of FFmpeg.
  *
@@ -22,7 +22,7 @@
 /**
  * @file
  * EXIF metadata parser
- * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
+ * @author Thilo Borgmann <thilo.borgmann _at_ mail.de>
  */
 
 #include "exif.h"
diff --git a/libavcodec/exif.h b/libavcodec/exif.h
index 307c1fed0cdb2c72c3bc06c27db815d4ffa0f724..71fe8292e13c6499cedd1d113b6e41564171de6e 100644
--- a/libavcodec/exif.h
+++ b/libavcodec/exif.h
@@ -1,6 +1,6 @@
 /*
  * EXIF metadata parser
- * Copyright (c) 2013 Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
+ * Copyright (c) 2013 Thilo Borgmann <thilo.borgmann _at_ mail.de>
  *
  * This file is part of FFmpeg.
  *
@@ -22,7 +22,7 @@
 /**
  * @file
  * EXIF metadata parser
- * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
+ * @author Thilo Borgmann <thilo.borgmann _at_ mail.de>
  */
 
 #ifndef AVCODEC_EXIF_H
diff --git a/libavcodec/tiff_common.c b/libavcodec/tiff_common.c
index 0995daea81026796dba7443b20ee9b3fda996357..b7bd587bbd9c4007c5de9482554593e65a54aadf 100644
--- a/libavcodec/tiff_common.c
+++ b/libavcodec/tiff_common.c
@@ -1,6 +1,6 @@
 /*
  * TIFF Common Routines
- * Copyright (c) 2013 Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
+ * Copyright (c) 2013 Thilo Borgmann <thilo.borgmann _at_ mail.de>
  *
  * This file is part of FFmpeg.
  *
@@ -22,7 +22,7 @@
 /**
  * @file
  * TIFF Common Routines
- * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
+ * @author Thilo Borgmann <thilo.borgmann _at_ mail.de>
  */
 
 #include "tiff_common.h"
diff --git a/libavcodec/tiff_common.h b/libavcodec/tiff_common.h
index 15eeb76df6d7ecfed29ef40d6fc5d387cba87c70..2e08caf2f660f05d60e57711c6308da26a43f999 100644
--- a/libavcodec/tiff_common.h
+++ b/libavcodec/tiff_common.h
@@ -1,6 +1,6 @@
 /*
  * TIFF Common Routines
- * Copyright (c) 2013 Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
+ * Copyright (c) 2013 Thilo Borgmann <thilo.borgmann _at_ mail.de>
  *
  * This file is part of FFmpeg.
  *
@@ -22,7 +22,7 @@
 /**
  * @file
  * TIFF Common Routines
- * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
+ * @author Thilo Borgmann <thilo.borgmann _at_ mail.de>
  */
 
 #ifndef AVCODEC_TIFF_COMMON_H