diff --git a/poolalloc/README b/poolalloc/README
index 6e0329d..a6392d2 100644
--- a/poolalloc/README
+++ b/poolalloc/README
@@ -77,5 +77,5 @@
 =============================
 The LLVM Developer's Mailing List provides announcements and general discussion
 about LLVM.  The list is low volume.  You can subscribe to it at
-http://mail.cs.uiuc.edu/mailman/listinfo/llvmdev.
+http://lists.llvm.org/mailman/listinfo/llvm-dev.
 
diff --git a/poolalloc/autoconf/configure.ac b/poolalloc/autoconf/configure.ac
index 055609a..6b48000 100644
--- a/poolalloc/autoconf/configure.ac
+++ b/poolalloc/autoconf/configure.ac
@@ -1,7 +1,7 @@
 dnl **************************************************************************
 dnl * Initialize
 dnl **************************************************************************
-AC_INIT([[[Pool Allocation]]],[[[1.0]]],[llvmbugs@cs.uiuc.edu])
+AC_INIT([[[Pool Allocation]]],[[[1.0]]],[llvm-bugs@lists.llvm.org])
 
 dnl Identify where LLVM source tree is
 LLVM_SRC_ROOT="`(cd $srcdir/../..; pwd)`"
diff --git a/poolalloc/configure b/poolalloc/configure
index 9402405..f0991c8 100755
--- a/poolalloc/configure
+++ b/poolalloc/configure
@@ -2,7 +2,7 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for [Pool Allocation] [1.0].
 #
-# Report bugs to <llvmbugs@cs.uiuc.edu>.
+# Report bugs to <llvm-bugs@lists.llvm.org>.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -271,7 +271,7 @@
 PACKAGE_TARNAME='--pool-allocation--'
 PACKAGE_VERSION='[1.0]'
 PACKAGE_STRING='[Pool Allocation] [1.0]'
-PACKAGE_BUGREPORT='llvmbugs@cs.uiuc.edu'
+PACKAGE_BUGREPORT='llvm-bugs@lists.llvm.org'
 
 ac_unique_file=""Makefile.common.in""
 # Factoring default headers for most tests.
@@ -865,7 +865,7 @@
 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 <llvmbugs@cs.uiuc.edu>.
+Report bugs to <llvm-bugs@lists.llvm.org>.
 _ACEOF
 fi
 
@@ -3072,7 +3072,7 @@
     (
       cat <<\_ASBOX
 ## ----------------------------------- ##
-## Report this to llvmbugs@cs.uiuc.edu ##
+## Report this to llvm-bugs@lists.llvm.org ##
 ## ----------------------------------- ##
 _ASBOX
     ) |
@@ -3225,7 +3225,7 @@
     (
       cat <<\_ASBOX
 ## ----------------------------------- ##
-## Report this to llvmbugs@cs.uiuc.edu ##
+## Report this to llvm-bugs@lists.llvm.org ##
 ## ----------------------------------- ##
 _ASBOX
     ) |
diff --git a/poolalloc/test/dsa/types/mrv.ll b/poolalloc/test/dsa/types/mrv.ll
index 2f93f7c..fe743fd 100644
--- a/poolalloc/test/dsa/types/mrv.ll
+++ b/poolalloc/test/dsa/types/mrv.ll
@@ -16,7 +16,7 @@
 ; Function foo, actually accepts an object of struct S. But as
 ; per calling conventions, the value is passed in registers, after
 ; conversion to a float and a double.
-; See http://lists.cs.uiuc.edu/pipermail/llvmdev/2010-January/028986.html
+; See http://lists.llvm.org/pipermail/llvm-dev/2010-January/028986.html
 
 %0 = type { double, float }
 %struct.S = type { float, float, float }