diff --git a/lib/ExecutionEngine/JIT/Intercept.cpp b/lib/ExecutionEngine/JIT/Intercept.cpp
index f078e098672..105514df3d0 100644
--- a/lib/ExecutionEngine/JIT/Intercept.cpp
+++ b/lib/ExecutionEngine/JIT/Intercept.cpp
@@ -46,7 +46,7 @@ static void runAtExitHandlers() {
 // strategy of making these functions work differently when inlined vs. when
 // not inlined, and hiding their real definitions in a separate archive file
 // that the dynamic linker can't see. For more info, search for
-// 'libc_nonshared.a' on Google, or read http://llvm.cs.uiuc.edu/PR274.
+// 'libc_nonshared.a' on Google, or read http://llvm.org/PR274.
 #if defined(__linux__)
 #if defined(HAVE_SYS_STAT_H)
 #include <sys/stat.h>
diff --git a/lib/System/README.txt b/lib/System/README.txt
index 4a73c95056e..63e00dafbfb 100644
--- a/lib/System/README.txt
+++ b/lib/System/README.txt
@@ -15,7 +15,7 @@ porting is this library.
 Complete documentation for the library can be found in the file:
   llvm/docs/SystemLibrary.html 
 or at this URL:
-  http://llvm.cs.uiuc.edu/docs/SystemLibrary.html
+  http://llvm.org/docs/SystemLibrary.html
 
 While we recommend that you read the more detailed documentation, for the 
 impatient, here's a high level summary of the library's requirements.
diff --git a/tools/bugpoint/bugpoint.cpp b/tools/bugpoint/bugpoint.cpp
index dde7286ae9f..7991ab835e8 100644
--- a/tools/bugpoint/bugpoint.cpp
+++ b/tools/bugpoint/bugpoint.cpp
@@ -51,7 +51,7 @@ static void BugpointInterruptFunction() {
 int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv,
                               " LLVM automatic testcase reducer. See\nhttp://"
-                              "llvm.cs.uiuc.edu/docs/CommandGuide/bugpoint.html"
+                              "llvm.org/docs/CommandGuide/bugpoint.html"
                               " for more information.\n");
   sys::PrintStackTraceOnErrorSignal();
   sys::SetInterruptFunction(BugpointInterruptFunction);
diff --git a/utils/NightlyTestTemplate.html b/utils/NightlyTestTemplate.html
index 1f470e938e4..5312ebb4268 100644
--- a/utils/NightlyTestTemplate.html
+++ b/utils/NightlyTestTemplate.html
@@ -29,8 +29,8 @@
 <p>
 
 <font size=+1><b>Back to:</b></font><br>
-<a href="http://llvm.cs.uiuc.edu/testresults/">Test&nbsp;Results</a><br>
-<a href="http://llvm.cs.uiuc.edu/">LLVM&nbsp;Page</a><p>
+<a href="http://llvm.org/testresults/">Test&nbsp;Results</a><br>
+<a href="http://llvm.org/">LLVM&nbsp;Page</a><p>
 
 </td><td valign=top>
 
diff --git a/utils/emacs/llvm-mode.el b/utils/emacs/llvm-mode.el
index 61aec9894a1..271ff0c9723 100644
--- a/utils/emacs/llvm-mode.el
+++ b/utils/emacs/llvm-mode.el
@@ -1,4 +1,4 @@
-;; Maintainer:  The LLVM team, http://llvm.cs.uiuc.edu/
+;; Maintainer:  The LLVM team, http://llvm.org/
 ;; Description: Major mode for the LLVM assembler language.
 ;; Updated:     2003-06-02
 
diff --git a/utils/emacs/tablegen-mode.el b/utils/emacs/tablegen-mode.el
index 9d08b86b572..56a672321e9 100644
--- a/utils/emacs/tablegen-mode.el
+++ b/utils/emacs/tablegen-mode.el
@@ -1,4 +1,4 @@
-;; Maintainer:  The LLVM team, http://llvm.cs.uiuc.edu/
+;; Maintainer:  The LLVM team, http://llvm.org/
 ;; Description: Major mode for TableGen description files (part of LLVM project)
 ;; Updated:     2003-08-11
 
diff --git a/utils/vim/llvm.vim b/utils/vim/llvm.vim
index eafc33654a8..712a9a59a73 100644
--- a/utils/vim/llvm.vim
+++ b/utils/vim/llvm.vim
@@ -1,6 +1,6 @@
 " Vim syntax file
 " Language:   llvm
-" Maintainer: The LLVM team, http://llvm.cs.uiuc.edu/
+" Maintainer: The LLVM team, http://llvm.org/
 " Updated:    2003-06-02
 
 if version < 600
diff --git a/utils/vim/tablegen.vim b/utils/vim/tablegen.vim
index 7ab8e2c021f..1514e2e0e82 100644
--- a/utils/vim/tablegen.vim
+++ b/utils/vim/tablegen.vim
@@ -1,6 +1,6 @@
 " Vim syntax file
 " Language:   TableGen
-" Maintainer: The LLVM team, http://llvm.cs.uiuc.edu/
+" Maintainer: The LLVM team, http://llvm.org/
 " Updated:    2003-08-11
 
 if version < 600