diff --git a/configure.in b/configure.in
index 08b403b36..8a7d61158 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_REVISION($Revision$)
 AC_PREREQ([2.59])
 test -z "$CFLAGS" && CFLAGS="-g"
-AC_INIT([Heimdal],[0.9pre],[heimdal-bugs@pdc.kth.se])
+AC_INIT([Heimdal],[0.9pre],[heimdal-bugs@h5l.se])
 AC_CONFIG_SRCDIR([kuser/kinit.c])
 AC_CONFIG_HEADERS(include/config.h)
 
diff --git a/doc/intro.texi b/doc/intro.texi
index bf3c5594d..85678c7e9 100644
--- a/doc/intro.texi
+++ b/doc/intro.texi
@@ -76,7 +76,7 @@ Kerberos V4 support in many of the applications.
 If you find bugs in this software, make sure it is a genuine bug and not
 just a part of the code that isn't implemented.
 
-Bug reports should be sent to @email{heimdal-bugs@@pdc.kth.se}. Please
+Bug reports should be sent to @email{heimdal-bugs@@h5l.se}. Please
 include information on what machine and operating system (including
 version) you are running, what you are trying to do, what happens, what
 you think should have happened, an example for us to repeat, the output