diff --git a/check_permissions.sh b/check_permissions.sh
index 43c4d3a..d4d3503 100755
--- a/check_permissions.sh
+++ b/check_permissions.sh
@@ -3,7 +3,7 @@
 # Script checking the right permissions for software installations:
 # Ordinary files must at least have permissions 664 and directories 755.
 # 
-# Christoph Niethammer <christoph.niethammer@web.de> (C) 2011
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2010-2011
 #
 
 declare -r APP_NAME="${0##*/}"
@@ -22,7 +22,7 @@ binary=`basename $0`
 cat <<EOF
 ${APP_NAME}: (${VERSION})
 
-Copyright (C) 2010-2011 Christoph Niethammer <christoph.niethammer@web.de>
+Copyright (C) 2010-2011 Christoph Niethammer <niethammer@hlrs.de>
 
 Usage: $APP_NAME DIR
 
diff --git a/extrae_install.sh b/extrae_install.sh
index 7cb10a4..adf4acf 100755
--- a/extrae_install.sh
+++ b/extrae_install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # installation script for Open MPI
 #
-# Christoph Niethammer <christoph.niethammer@web.de> (C) 2011
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
 #
  
 # exit on any error!
diff --git a/install_toolchain.sh b/install_toolchain.sh
index 8f86655..3b634a1 100755
--- a/install_toolchain.sh
+++ b/install_toolchain.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Installation script to build the autotools toolchain.
-# Christoph Niethammer <christoph.niethammer@web.de> (C) 2011
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
 
 set -e
 set -x
diff --git a/mcxx-nanox_install.sh b/mcxx-nanox_install.sh
index 450269e..8a99f89 100755
--- a/mcxx-nanox_install.sh
+++ b/mcxx-nanox_install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # installation script for Mercurium Compiler + Nanons++
 #
-# Christoph Niethammer <christoph.niethammer@web.de> (C) 2011
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
 #
  
 # exit on any error!
diff --git a/mvapich2_install.sh b/mvapich2_install.sh
index a079ec7..34266a9 100755
--- a/mvapich2_install.sh
+++ b/mvapich2_install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # installation script for Open MPI
 #
-# Christoph Niethammer <christoph.niethammer@web.de> (C) 2011
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
 #
  
 # exit on any error!
diff --git a/openmpi_install.sh b/openmpi_install.sh
index 1a95362..07cd6a8 100755
--- a/openmpi_install.sh
+++ b/openmpi_install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # installation script for Open MPI
 #
-# Christoph Niethammer <christoph.niethammer@web.de> (C) 2011
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
 #
  
 # exit on any error!
diff --git a/packages/mpi/mvapich2-1.6rc3 b/packages/mpi/mvapich2-1.6rc3
index 0ccf0ab..e444339 100755
--- a/packages/mpi/mvapich2-1.6rc3
+++ b/packages/mpi/mvapich2-1.6rc3
@@ -1,7 +1,7 @@
 #!/bin/sh
 # MVAPICH2 sit class file
 #
-# Christoph Niethammer <christoph.niethammer@web.de> (C) 2011
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
 #
  
 CATEGORY="mpi"
diff --git a/packages/mpi/openmpi-1.5.1 b/packages/mpi/openmpi-1.5.1
index 5f3e721..e3700cb 100755
--- a/packages/mpi/openmpi-1.5.1
+++ b/packages/mpi/openmpi-1.5.1
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Open MPI sit class file
 #
-# Christoph Niethammer <christoph.niethammer@web.de> (C) 2011
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
 #
  
 CATEGORY="mpi"
diff --git a/packages/performance/extrae-2.1.1 b/packages/performance/extrae-2.1.1
index a55f212..af3d77c 100755
--- a/packages/performance/extrae-2.1.1
+++ b/packages/performance/extrae-2.1.1
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Extrae sit class file
 #
-# Christoph Niethammer <christoph.niethammer@web.de> (C) 2011
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
 #
  
 CATEGORY="performance"
diff --git a/packages/performance/vampirtrace-5.10 b/packages/performance/vampirtrace-5.10
index 65e632c..e4614bb 100755
--- a/packages/performance/vampirtrace-5.10
+++ b/packages/performance/vampirtrace-5.10
@@ -1,7 +1,7 @@
 #!/bin/sh
 # VampirTrace sit class file
 #
-# Christoph Niethammer <christoph.niethammer@web.de> (C) 2011
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
 #
  
 CATEGORY="performance"
diff --git a/sit b/sit
index 791cb36..94332cc 100755
--- a/sit
+++ b/sit
@@ -2,7 +2,7 @@
 #
 # Install script inspired by the ebuild system of Gentoo Linux
 #
-# Christoph Niethammer <christoph.niethammer@web.de> (C) 2011
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
 #
  
 # exit on any error!
diff --git a/starss_install.sh b/starss_install.sh
index 215ed0b..9e6f489 100755
--- a/starss_install.sh
+++ b/starss_install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # installation script for Open MPI
 #
-# Christoph Niethammer <christoph.niethammer@web.de> (C) 2011
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
 #
  
 # exit on any error!
diff --git a/vampirtrace_install.sh b/vampirtrace_install.sh
index c910c05..f5fe923 100755
--- a/vampirtrace_install.sh
+++ b/vampirtrace_install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # installation script for Open MPI
 #
-# Christoph Niethammer <christoph.niethammer@web.de> (C) 2011
+# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
 #
  
 # exit on any error!