diff --git a/llvm/docs/CommandGuide/analyze.html b/llvm/docs/CommandGuide/analyze.html
index 76bc6fb..15a0639 100644
--- a/llvm/docs/CommandGuide/analyze.html
+++ b/llvm/docs/CommandGuide/analyze.html
@@ -81,7 +81,7 @@
 opt
 
 <HR>
-University of Illinois at Urbana-Champaign
+<a href="http://llvm.cs.uiuc.edu">LLVM Team</a>
 </body>
 </html>
 
diff --git a/llvm/docs/CommandGuide/gccas.html b/llvm/docs/CommandGuide/gccas.html
index d1dbb75..aaed196 100644
--- a/llvm/docs/CommandGuide/gccas.html
+++ b/llvm/docs/CommandGuide/gccas.html
@@ -75,7 +75,7 @@
 llvm-dis
 
 <HR>
-University of Illinois at Urbana-Champaign
+<a href="http://llvm.cs.uiuc.edu">LLVM Team</a>
 </body>
 </html>
 
diff --git a/llvm/docs/CommandGuide/gccld.html b/llvm/docs/CommandGuide/gccld.html
index 15a4f5f..ea1c30c 100644
--- a/llvm/docs/CommandGuide/gccld.html
+++ b/llvm/docs/CommandGuide/gccld.html
@@ -118,7 +118,7 @@
 llvm-dis
 
 <HR>
-University of Illinois at Urbana-Champaign
+<a href="http://llvm.cs.uiuc.edu">LLVM Team</a>
 </body>
 </html>
 
diff --git a/llvm/docs/CommandGuide/index.html b/llvm/docs/CommandGuide/index.html
index fcb4904..022e9ee 100644
--- a/llvm/docs/CommandGuide/index.html
+++ b/llvm/docs/CommandGuide/index.html
@@ -17,69 +17,77 @@
 	are.
 
 	<!--===============================================================-->
-	<h2><a name="llvmcmds">LLVM Commands</a><hr></h2>
+	<h2><a name="llvmcmds">LLVM Base Commands</a><hr></h2>
 	<!--===============================================================-->
 
 	<dl compact>
-		<dt><A href="CommandGuide/bugpoint.html"><b>bugpoint</b></A>
-		<dd>
-		Trace an LLVM bytecode program and reduce its failure to a
-		simple testcase.
-		<p>
-
-		<dt><A href="CommandGuide/llvmas.html"><b>as</b></A>
-		<dt><A href="CommandGuide/llvmas.html"><b>llvm-as</b></A>
+		<dt><A href="llvmas.html"><b>llvm-as</b></A>
 		<dd>
 		Assemble a human-readable LLVM program into LLVM bytecode.
 		<p>
 
-		<dt><A href="CommandGuide/llvmdis.html"><b>dis</b></A>
-		<dt><A href="CommandGuide/llvmdis.html"><b>llvm-dis</b></A>
+		<dt><A href="llvmdis.html"><b>llvm-dis</b></A>
 		<dd>
 		Disassemble an LLVM bytecode file into human-readable form.
 		<p>
 
-		<dt><A href="CommandGuide/extract.html"><b>extract</b></A>
-		<dd>
-		Extract a function from an LLVM bytecode file.
-		<p>
-
-		<dt><A href="CommandGuide/analyze.html"><b>analyze</b></A>
+		<dt><A href="analyze.html"><b>analyze</b></A>
 		<dd>
 		Analyze an LLVM bytecode file.
 		<p>
 
-		<dt><A href="CommandGuide/opt.html"><b>opt</b></A>
+		<dt><A href="opt.html"><b>opt</b></A>
 		<dd>
 		Optimize an LLVM bytecode file.
 		<p>
 
-		<dt><A href="CommandGuide/link.html"><b>link</b></A>
+		<dt><A href="link.html"><b>link</b></A>
 		<dd>
 		Link several LLVM bytecode files together into one LLVM
 		bytecode file.
 		<p>
 
-		<dt><A href="CommandGuide/gccas.html"><b>gccas</b></A>
-		<dd>
-		LLVM assembler used by GCC and other native compiler tools.
-		<p>
-
-		<dt><A href="CommandGuide/gccld.html"><b>gccld</b></A>
-		<dd>
-		LLVM linker used by GCC and other native compiler tools.
-		<p>
-
-		<dt><A href="CommandGuide/llc.html"><b>llc</b></A>
+		<dt><A href="llc.html"><b>llc</b></A>
 		<dd>
 		Compile an LLVM bytecode program into native machine code.
 
-		<dt><A href="CommandGuide/lli.html"><b>lli</b></A>
+		<dt><A href="lli.html"><b>lli</b></A>
 		<dd>
 		Run an LLVM bytecode program using either an interpreter or a
 		JIT compiler.
 		<p>
 	</dl>
 
+	<!--===============================================================-->
+	<h2><a name="llvmcmds">LLVM Debugging Tools</a><hr></h2>
+	<!--===============================================================-->
+
+	<dl compact>
+		<dt><A href="bugpoint.html"><b>bugpoint</b></A>
+		<dd>
+		Trace an LLVM bytecode program and reduce its failure to a
+		simple testcase.
+		<p>
+
+		<dt><A href="extract.html"><b>extract</b></A>
+		<dd>
+		Extract a function from an LLVM bytecode file.
+	</dl>
+
+	<!--===============================================================-->
+	<h2><a name="llvmcmds">LLVM GCC Support Commands</a><hr></h2>
+	<!--===============================================================-->
+
+	<dl compact>
+		<dt><A href="gccas.html"><b>gccas</b></A>
+		<dd>
+		LLVM assembler used by GCC and other native compiler tools.
+		<p>
+
+		<dt><A href="gccld.html"><b>gccld</b></A>
+		<dd>
+		LLVM linker used by GCC and other native compiler tools.
+	</dl>
+
 	</body>
 </html>
diff --git a/llvm/docs/CommandGuide/lli.html b/llvm/docs/CommandGuide/lli.html
index 3495398..f6b2921 100644
--- a/llvm/docs/CommandGuide/lli.html
+++ b/llvm/docs/CommandGuide/lli.html
@@ -74,7 +74,7 @@
 llvm-dis
 
 <HR>
-University of Illinois at Urbana-Champaign
+<a href="http://llvm.cs.uiuc.edu">LLVM Team</a>
 </body>
 </html>
 
diff --git a/llvm/docs/CommandGuide/llvm-as.html b/llvm/docs/CommandGuide/llvm-as.html
index 26ff47f..e92d3b7 100644
--- a/llvm/docs/CommandGuide/llvm-as.html
+++ b/llvm/docs/CommandGuide/llvm-as.html
@@ -77,7 +77,7 @@
 llvm-dis
 
 <HR>
-University of Illinois at Urbana-Champaign
+<a href="http://llvm.cs.uiuc.edu">LLVM Team</a>
 </body>
 </html>
 
diff --git a/llvm/docs/CommandGuide/llvm-dis.html b/llvm/docs/CommandGuide/llvm-dis.html
index b90442e..079933c 100644
--- a/llvm/docs/CommandGuide/llvm-dis.html
+++ b/llvm/docs/CommandGuide/llvm-dis.html
@@ -83,7 +83,7 @@
 llvm-dis
 
 <HR>
-University of Illinois at Urbana-Champaign
+<a href="http://llvm.cs.uiuc.edu">LLVM Team</a>
 </body>
 </html>
 
diff --git a/llvm/docs/CommandGuide/opt.html b/llvm/docs/CommandGuide/opt.html
index 8e1274e..86dcf73 100644
--- a/llvm/docs/CommandGuide/opt.html
+++ b/llvm/docs/CommandGuide/opt.html
@@ -110,7 +110,7 @@
 analyze
 
 <HR>
-University of Illinois at Urbana-Champaign
+<a href="http://llvm.cs.uiuc.edu">LLVM Team</a>
 </body>
 </html>