diff --git a/AUTHORS b/AUTHORS
index b063debc..47a45b4e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,5 +3,5 @@ Michael Smith <msmith@icecast.org>
 oddsock <oddsock@xiph.org>
 Karl Heyes <karl@xiph.org>
 Philipp "ph3-der-loewe" Schafft <lion@lion.leolix.org>
-Thomas B. "dm8tbr" Ruecker <thomas.rucker@tieto.com>
+Thomas B. "dm8tbr" Ruecker <thomas@ruecker.fi>
 David "oneman" Richards <kradradio@gmail.com>
diff --git a/admin/vclt.xsl b/admin/vclt.xsl
index 0526ba0b..a5dbf619 100644
--- a/admin/vclt.xsl
+++ b/admin/vclt.xsl
@@ -1,7 +1,7 @@
 <!--
     VCLT xslt stylesheet for Icecast 2.3.2 and above
     based on XSPF xslt stylesheet.
-    Copyright (C) 2007 Thomas B. Ruecker, tbr@ruecker-itk.de
+    Copyright (C) 2007 Thomas B. Ruecker, <tbr@ruecker.fi>
     Copyright (C) 2011 Philipp Schafft, lion@lion.leolix.org
 
     This program is free software; you can redistribute it and/or
diff --git a/admin/xspf.xsl b/admin/xspf.xsl
index c8a8474a..d94f8fdd 100644
--- a/admin/xspf.xsl
+++ b/admin/xspf.xsl
@@ -1,6 +1,6 @@
 <!--
     XSPF xslt stylesheet for Icecast and above
-    Copyright (C) 2007 Thomas B. Ruecker, thomas@ruecker.fi
+    Copyright (C) 2007 Thomas B. Ruecker, <thomas@ruecker.fi>
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
diff --git a/src/cfgfile.c b/src/cfgfile.c
index dcb265bf..3c800047 100644
--- a/src/cfgfile.c
+++ b/src/cfgfile.c
@@ -8,8 +8,8 @@
  *                      oddsock <oddsock@xiph.org>,
  *                      Karl Heyes <karl@xiph.org>
  *                      and others (see AUTHORS for details).
- * Copyright 2011,      Thomas B. "dm8tbr" Ruecker <thomas.ruecker@tieto.com>,
- *                      Dave 'justdave' Miller <justdave@mozilla.com>.
+ * Copyright 2011,      Dave 'justdave' Miller <justdave@mozilla.com>.
+ * Copyright 2011-2014, Thomas B. "dm8tbr" Ruecker <thomas@ruecker.fi>,
  * Copyright 2011-2014, Philipp "ph3-der-loewe" Schafft <lion@lion.leolix.org>,
  */