diff --git a/llvm/docs/CommandGuide/analyze.pod b/llvm/docs/CommandGuide/analyze.pod
index e1bbe780645a..d5eff7ad8812 100644
--- a/llvm/docs/CommandGuide/analyze.pod
+++ b/llvm/docs/CommandGuide/analyze.pod
@@ -70,6 +70,6 @@ L<opt|opt>
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/bugpoint.pod b/llvm/docs/CommandGuide/bugpoint.pod
index 11aec03e259e..d2b922bd6175 100644
--- a/llvm/docs/CommandGuide/bugpoint.pod
+++ b/llvm/docs/CommandGuide/bugpoint.pod
@@ -113,6 +113,6 @@ L<opt|opt>, L<analyze|analyze>
 
 =head1 AUTHOR
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/gccas.pod b/llvm/docs/CommandGuide/gccas.pod
index 0c491a21dec3..7dbfae879295 100644
--- a/llvm/docs/CommandGuide/gccas.pod
+++ b/llvm/docs/CommandGuide/gccas.pod
@@ -71,6 +71,6 @@ L<llvm-as|llvm-as>, L<gccld|gccld>
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/gccld.pod b/llvm/docs/CommandGuide/gccld.pod
index 6b7cfa186c41..6dc496529edd 100644
--- a/llvm/docs/CommandGuide/gccld.pod
+++ b/llvm/docs/CommandGuide/gccld.pod
@@ -170,6 +170,6 @@ L<llvm-link|llvm-link>, L<gccas|gccas>
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/index.html b/llvm/docs/CommandGuide/index.html
index bdb15c99c4f5..bb1b73b65a0d 100644
--- a/llvm/docs/CommandGuide/index.html
+++ b/llvm/docs/CommandGuide/index.html
@@ -139,7 +139,7 @@ options) arguments to the tool you are interested in.</p>
   <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>
 
diff --git a/llvm/docs/CommandGuide/llc.pod b/llvm/docs/CommandGuide/llc.pod
index c5db89eec31e..6d9d64acdbc9 100644
--- a/llvm/docs/CommandGuide/llc.pod
+++ b/llvm/docs/CommandGuide/llc.pod
@@ -186,6 +186,6 @@ L<lli|lli>
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/lli.pod b/llvm/docs/CommandGuide/lli.pod
index 0a441c7ccee4..90f3b0484bba 100644
--- a/llvm/docs/CommandGuide/lli.pod
+++ b/llvm/docs/CommandGuide/lli.pod
@@ -92,6 +92,6 @@ L<llc|llc>
 
 =head1 AUTHOR
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/llvm-ar.pod b/llvm/docs/CommandGuide/llvm-ar.pod
index 0253d4f92112..e8265c9aa4c1 100644
--- a/llvm/docs/CommandGuide/llvm-ar.pod
+++ b/llvm/docs/CommandGuide/llvm-ar.pod
@@ -401,6 +401,6 @@ L<llvm-ranlib|llvm-ranlib>, L<ar(1)>
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/llvm-as.pod b/llvm/docs/CommandGuide/llvm-as.pod
index 35e79c7c3bc4..b45fdf63bf55 100644
--- a/llvm/docs/CommandGuide/llvm-as.pod
+++ b/llvm/docs/CommandGuide/llvm-as.pod
@@ -72,6 +72,6 @@ L<llvm-dis|llvm-dis>, L<gccas|gccas>
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/llvm-bcanalyzer.pod b/llvm/docs/CommandGuide/llvm-bcanalyzer.pod
index e7227e1954ef..bf910e8f36b8 100644
--- a/llvm/docs/CommandGuide/llvm-bcanalyzer.pod
+++ b/llvm/docs/CommandGuide/llvm-bcanalyzer.pod
@@ -306,10 +306,10 @@ Rate encoding scheme. The percentage is relative to # of VBR Expanded Bytes.
 
 =head1 SEE ALSO
 
-L<llvm-dis|llvm-dis>, L<http://llvm.cs.uiuc.edu/docs/BytecodeFormat.html>
+L<llvm-dis|llvm-dis>, L<http://llvm.org/docs/BytecodeFormat.html>
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/llvm-db.pod b/llvm/docs/CommandGuide/llvm-db.pod
index 14073dd104a4..132417685c2b 100644
--- a/llvm/docs/CommandGuide/llvm-db.pod
+++ b/llvm/docs/CommandGuide/llvm-db.pod
@@ -7,10 +7,10 @@ llvm-db - LLVM debugger (alpha)
 =head1 SYNOPSIS
 
 Details coming soon. Please see 
-L<http://llvm.cs.uiuc.edu/docs/SourceLevelDebugging.html> in the meantime.
+L<http://llvm.org/docs/SourceLevelDebugging.html> in the meantime.
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/llvm-dis.pod b/llvm/docs/CommandGuide/llvm-dis.pod
index 0b6641a3496a..3fafbf2edabd 100644
--- a/llvm/docs/CommandGuide/llvm-dis.pod
+++ b/llvm/docs/CommandGuide/llvm-dis.pod
@@ -55,6 +55,6 @@ L<llvm-as|llvm-as>
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/llvm-extract.pod b/llvm/docs/CommandGuide/llvm-extract.pod
index 5ffe8689f9f4..77f5ee8153fb 100644
--- a/llvm/docs/CommandGuide/llvm-extract.pod
+++ b/llvm/docs/CommandGuide/llvm-extract.pod
@@ -58,6 +58,6 @@ L<bugpoint|bugpoint>
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/llvm-ld.pod b/llvm/docs/CommandGuide/llvm-ld.pod
index 2b9d92dcf1c4..fb5418cc0435 100644
--- a/llvm/docs/CommandGuide/llvm-ld.pod
+++ b/llvm/docs/CommandGuide/llvm-ld.pod
@@ -181,6 +181,6 @@ L<llvm-ar|llvm-ar>
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/llvm-link.pod b/llvm/docs/CommandGuide/llvm-link.pod
index 3c12cf9bdf6a..7766efab6926 100644
--- a/llvm/docs/CommandGuide/llvm-link.pod
+++ b/llvm/docs/CommandGuide/llvm-link.pod
@@ -69,6 +69,6 @@ L<gccld|gccld>
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/llvm-nm.pod b/llvm/docs/CommandGuide/llvm-nm.pod
index 8a10405715fe..55007839cad8 100644
--- a/llvm/docs/CommandGuide/llvm-nm.pod
+++ b/llvm/docs/CommandGuide/llvm-nm.pod
@@ -117,6 +117,6 @@ L<llvm-dis|llvm-dis>, L<ar(1)>, L<nm(1)>
 
 =head1 AUTHOR
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/llvm-prof.pod b/llvm/docs/CommandGuide/llvm-prof.pod
index b65902077b42..c8d2d311e0dc 100644
--- a/llvm/docs/CommandGuide/llvm-prof.pod
+++ b/llvm/docs/CommandGuide/llvm-prof.pod
@@ -52,6 +52,6 @@ information. Otherwise, it exits with zero.
 
 =head1 AUTHOR
 
-B<llvm-prof> is maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+B<llvm-prof> is maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/llvm-ranlib.pod b/llvm/docs/CommandGuide/llvm-ranlib.pod
index 561bf737417e..c3473c9a914f 100644
--- a/llvm/docs/CommandGuide/llvm-ranlib.pod
+++ b/llvm/docs/CommandGuide/llvm-ranlib.pod
@@ -47,6 +47,6 @@ L<llvm-ar|llvm-ar>, ranlib(1)
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/llvmc.pod b/llvm/docs/CommandGuide/llvmc.pod
index 4f8a967b726e..07672128219c 100644
--- a/llvm/docs/CommandGuide/llvmc.pod
+++ b/llvm/docs/CommandGuide/llvmc.pod
@@ -400,6 +400,6 @@ L<llc|llc>, L<llvm-link|llvm-link>
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/llvmgcc.pod b/llvm/docs/CommandGuide/llvmgcc.pod
index 2f58e56c86a4..f2981d5c4b10 100644
--- a/llvm/docs/CommandGuide/llvmgcc.pod
+++ b/llvm/docs/CommandGuide/llvmgcc.pod
@@ -89,7 +89,7 @@ L<llvm-g++|llvmgxx>, L<gccas|gccas>, L<gccld|gccld>
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
 
diff --git a/llvm/docs/CommandGuide/llvmgxx.pod b/llvm/docs/CommandGuide/llvmgxx.pod
index 9b76b2ccd6f8..00b869c2a39a 100644
--- a/llvm/docs/CommandGuide/llvmgxx.pod
+++ b/llvm/docs/CommandGuide/llvmgxx.pod
@@ -89,7 +89,7 @@ L<llvm-gcc|llvmgcc>, L<gccas>, L<gccld>
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
 
diff --git a/llvm/docs/CommandGuide/opt.pod b/llvm/docs/CommandGuide/opt.pod
index 64062ec49df4..6c149b691242 100644
--- a/llvm/docs/CommandGuide/opt.pod
+++ b/llvm/docs/CommandGuide/opt.pod
@@ -92,6 +92,6 @@ L<analyze|analyze>
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut
diff --git a/llvm/docs/CommandGuide/stkrc.pod b/llvm/docs/CommandGuide/stkrc.pod
index 54e46b444d3d..ba5489d3583c 100644
--- a/llvm/docs/CommandGuide/stkrc.pod
+++ b/llvm/docs/CommandGuide/stkrc.pod
@@ -13,7 +13,7 @@ B<stkrc> [I<options>] [I<filename>]
 The B<stkrc> command is the compiler for the Stacker language. Stacker is a
 simple stack based, Forth-like language that was written as a demonstration
 language for LLVM. For details on the language, please see
-L<http://llvm.cs.uiuc.edu/docs/Stacker.html> . The B<stkrc> compiler is fairly 
+L<http://llvm.org/docs/Stacker.html> . The B<stkrc> compiler is fairly 
 minimal. It compiles to bytecode only and doesn't perform any optimizations.
 The output of stkrc (a bytecode file) can be piped through other LLVM tools
 for optimization and linking.
@@ -87,10 +87,10 @@ occurs, it will exit with a non-zero value, usually 1.
 
 =head1 SEE ALSO
 
-L<llvm-as>, L<http://llvm.cs.uiuc.edu/docs/Stacker.html>
+L<llvm-as>, L<http://llvm.org/docs/Stacker.html>
 
 =head1 AUTHORS
 
-Maintained by the LLVM Team (L<http://llvm.cs.uiuc.edu>).
+Maintained by the LLVM Team (L<http://llvm.org>).
 
 =cut