diff --git a/docs/index.html b/docs/index.html
index 2e8f643..a390dc7 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -20,7 +20,7 @@
 </ul>
 </td><td class="right">
   <form action="http://www.google.com/search" method=get>
-      <input type="hidden" name="sitesearch" value="llvm.cs.uiuc.edu/docs">
+      <input type="hidden" name="sitesearch" value="llvm.org/docs">
       <input type=text name=q size=25><br>
       <input type=submit value="Search the LLVM Docs" name="submit">
   </form>
@@ -28,7 +28,7 @@
 </div>
 
 <div class="doc_author">    
-  <p>Written by <a href="http://llvm.cs.uiuc.edu">The LLVM Team</a></p>
+  <p>Written by <a href="http://llvm.org">The LLVM Team</a></p>
 </div>
 
 <!--=======================================================================-->
@@ -36,7 +36,7 @@
 <!--=======================================================================-->
 
 <ul>
-<li><a href="http://llvm.cs.uiuc.edu/pubs/2004-01-30-CGO-LLVM.html">LLVM: A
+<li><a href="http://llvm.org/pubs/2004-01-30-CGO-LLVM.html">LLVM: A
 Compilation Framework for Lifelong Program Analysis &amp; Transformation</a>: -
 Describes the LLVM instruction set and compilation strategy.  This should be the
 first document you read to get an overview of LLVM.</li>
@@ -146,14 +146,14 @@
 <li><a href="UsingLibraries.html">Using LLVM Libraries</a> - Look here to
 understand how to use the libraries produced when LLVM is compiled.</li>
 
-<li><a href="http://llvm.cs.uiuc.edu/doxygen/">Doxygen generated 
+<li><a href="http://llvm.org/doxygen/">Doxygen generated 
 documentation</a> (<a
-href="http://llvm.cs.uiuc.edu/doxygen/inherits.html">classes</a>)
+href="http://llvm.org/doxygen/inherits.html">classes</a>)
 
-(<a href="http://llvm.cs.uiuc.edu/doxygen/doxygen.tar.gz">tarball</a>)
+(<a href="http://llvm.org/doxygen/doxygen.tar.gz">tarball</a>)
 </li>
 
-<li><a href="http://llvm.cs.uiuc.edu/cvsweb/cvsweb.cgi/llvm">CVSWeb CVS Tree 
+<li><a href="http://llvm.org/cvsweb/cvsweb.cgi/llvm">CVSWeb CVS Tree 
 Browser</a></li>
 
 </ul>
@@ -249,7 +249,7 @@
   <a href="http://validator.w3.org/check/referer"><img
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
 
-  <a href="http://llvm.cs.uiuc.edu">LLVM Compiler Infrastructure</a><br>
+  <a href="http://llvm.org">LLVM Compiler Infrastructure</a><br>
   Last modified: $Date$
 </address>