diff --git a/AUTHORS b/AUTHORS
index 912a7d90..719eee5c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1 @@
-David Mosberger <davidm@hpl.hp.com>
+David Mosberger <dmosberger@gmail.org>
diff --git a/configure b/configure
index 3b14cda4..0156c45b 100755
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for libunwind 0.99-alpha.
 #
-# Report bugs to <libunwind@linux.hpl.hp.com>.
+# Report bugs to <libunwind-devel@nongnu.org>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -730,7 +730,7 @@ PACKAGE_NAME='libunwind'
 PACKAGE_TARNAME='libunwind'
 PACKAGE_VERSION='0.99-alpha'
 PACKAGE_STRING='libunwind 0.99-alpha'
-PACKAGE_BUGREPORT='libunwind@linux.hpl.hp.com'
+PACKAGE_BUGREPORT='libunwind-devel@nongnu.org'
 
 ac_unique_file="src/mi/backtrace.c"
 # Factoring default headers for most tests.
@@ -1546,7 +1546,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <libunwind@linux.hpl.hp.com>.
+Report bugs to <libunwind-devel@nongnu.org>.
 _ACEOF
 ac_status=$?
 fi
@@ -5751,7 +5751,7 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to libunwind@linux.hpl.hp.com ##
+## Report this to libunwind-devel@nongnu.org ##
 ## ----------------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -19645,7 +19645,7 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to libunwind@linux.hpl.hp.com ##
+## Report this to libunwind-devel@nongnu.org ##
 ## ----------------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -19980,7 +19980,7 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------------- ##
-## Report this to libunwind@linux.hpl.hp.com ##
+## Report this to libunwind-devel@nongnu.org ##
 ## ----------------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
@@ -21018,7 +21018,7 @@ ARCH=`echo $target_arch | tr a-z A-Z`
 PKG_MAJOR=0
 PKG_MINOR=99
 PKG_EXTRA=-alpha
-PKG_MAINTAINER=libunwind@linux.hpl.hp.com
+PKG_MAINTAINER=libunwind-devel@nongnu.org
 
 
 
diff --git a/configure.in b/configure.in
index a1790698..bf44eaae 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 define(pkg_major, 0)
 define(pkg_minor, 99)
 define(pkg_extra, -alpha)
-define(pkg_maintainer, libunwind@linux.hpl.hp.com)
+define(pkg_maintainer, libunwind-devel@nongnu.org)
 define(mkvers, $1.$2$3)
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(libunwind, mkvers(pkg_major, pkg_minor, pkg_extra), pkg_maintainer)