diff --git a/configure.ac b/configure.ac
index 074df3a533d4f6211006169eb4feee4351240a1c..179f538f23dd0f81f823b17097138626490fa709 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #! /bin/bash
 # $Id$
 # Process this file with autoconf to produce a configure script.
-AC_INIT(dune-common, 0.0, dune@hal.iwr.uni-heidelberg.de)
+AC_INIT(dune-common, 0.0, dune@dune-project.org)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([common/stdstreams.cc])
 AM_CONFIG_HEADER([config.h])
diff --git a/doc/buildsystem/buildsystem.tex b/doc/buildsystem/buildsystem.tex
index 1158e8b23273083adea21e3f0a428201d6daf865..aaa43a9a392c3e18a1c9020c09de06f26f416a9f 100644
--- a/doc/buildsystem/buildsystem.tex
+++ b/doc/buildsystem/buildsystem.tex
@@ -52,7 +52,7 @@
 Universität Heidelberg,\\
 Im Neuenheimer Feld 368, D-69120 Heidelberg, Germany}\\
 \bigskip
-{\normalsize \texttt{\url{http://hal.iwr.uni-heidelberg.de/dune/}}}\\
+{\normalsize \texttt{\url{http://www.dune-project.org/}}}\\
 }
 
 \begin{document}
diff --git a/m4/dune.m4 b/m4/dune.m4
index e382d19e44cb9abe33311e5276880456a57045cb..882d916a2fc4cba5babe1f6a9be28b20db5d0e87 100644
--- a/m4/dune.m4
+++ b/m4/dune.m4
@@ -276,7 +276,7 @@ AC_DEFUN([DUNE_SYMLINK],[
 
       # sanity check
       if ! test -r dune/$ac_unique_file ; then
-        AC_MSG_ERROR([Sanity check for symlink failed! Please send a bugreport to dune@hal.iwr.uni-heidelberg.de])
+        AC_MSG_ERROR([Sanity check for symlink failed! Please send a bugreport to dune@dune-project.org])
       fi
     fi 
   else