diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd8b753..d77f784 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,7 @@
   set(PACKAGE_NAME libcxxabi)
   set(PACKAGE_VERSION 3.7.0svn)
   set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
-  set(PACKAGE_BUGREPORT "llvmbugs@cs.uiuc.edu")
+  set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
 
   if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
     set(LLVM_LIT ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
diff --git a/www/index.html b/www/index.html
index cc34014..bf4f8cf 100644
--- a/www/index.html
+++ b/www/index.html
@@ -22,8 +22,8 @@
 
   <div class="submenu">
     <label>Quick Links</label>
-    <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev">cfe-dev</a>
-    <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits">cfe-commits</a>
+    <a href="http://lists.llvm.org/mailman/listinfo/cfe-dev">cfe-dev</a>
+    <a href="http://lists.llvm.org/mailman/listinfo/cfe-commits">cfe-commits</a>
     <a href="http://llvm.org/bugs/">Bug Reports</a>
     <a href="http://llvm.org/svn/llvm-project/libcxxabi/trunk/">Browse SVN</a>
     <a href="http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/">Browse ViewVC</a>
@@ -119,7 +119,7 @@
   a different ABI library), this may interfere with test results.</p>
 
   <p>Send discussions to the
-  (<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev">clang mailing list</a>).</p>
+  (<a href="http://lists.llvm.org/mailman/listinfo/cfe-dev">clang mailing list</a>).</p>
 
   <!--=====================================================================-->
   <h2>Frequently asked questions</h2>