diff --git a/README.txt b/README.txt
index 67182ecf9a9..2dd797399ac 100644
--- a/README.txt
+++ b/README.txt
@@ -1,8 +1,8 @@
                        The LLVM Compiler Infrastructure
-		           http://llvm.cs.uiuc.edu
+                           http://llvm.cs.uiuc.edu
 
 Welcome to LLVM!
------------------
+----------------
 This file is intended to do four things:
 (1) help you get started using LLVM;
 (2) tell you how to get questions about LLVM answered;
@@ -14,13 +14,13 @@ Getting Started with LLVM
 -------------------------
 
 (1) For license information:
-	llvm/LICENSE.txt
+    llvm/LICENSE.txt
 
 (2) Installing and compiling LLVM:
-	llvm/docs/GettingStarted.html
+    llvm/docs/GettingStarted.html
 
 (3) Learn about features and limitations of this release:
-	llvm/docs/ReleaseNotes.html
+    llvm/docs/ReleaseNotes.html
 
 (4) Learn how to write a pass within the LLVM system:
 	llvm/docs/WritingAnLLVMPass.html
@@ -28,7 +28,7 @@ Getting Started with LLVM
 (5) Learn how to start a new development project using LLVM, where your
     new source code can live anywhere (outside or inside the LLVM tree),
     while using LLVM header files and libraries:
-	llvm/docs/Projects.html
+    llvm/docs/Projects.html
 
 
 Getting Help with LLVM
@@ -40,65 +40,64 @@ Getting Help with LLVM
     expect prompt first responses.
 
 (2) To report a bug, submit a bug report as described in the document:
-		http://llvm.cs.uiuc.edu/docs/HowToSubmitABug.html
+    http://llvm.cs.uiuc.edu/docs/HowToSubmitABug.html
 
 (3) We now use Bugzilla to track bugs, so you can check the status of
     previous bugs at:
-	     <FIXME: WHERE DO THEY GO???>
-
+    http://llvm.cs.uiuc.edu/bugs/query.cgi
 
 LLVM Documentation
 ------------------
 
 All the documents mentioned below except the design overview tech report
-are include as part of the LLVM release (in llvm/docs/*):
+are included as part of the LLVM release (in llvm/docs/*):
 
 LLVM Design Overview:
-       LLVM : A Compilation Framework for Lifelong Program Analysis
-       and Transformation:
-	  http://llvm.cs.uiuc.edu/pubs/2003-09-30-LifelongOptimizationTR.html
+    LLVM : A Compilation Framework for Lifelong Program Analysis
+    and Transformation:
+        http://llvm.cs.uiuc.edu/pubs/2003-09-30-LifelongOptimizationTR.html
 
 LLVM User Guides:
 
-	Download and Installation Instructions:
-		llvm/docs/GettingStarted.html
+    Download and Installation Instructions:
+        llvm/docs/GettingStarted.html
 
-	LLVM Command Guide:
-		llvm/docs/CommandGuide/CommandGuide.html
+    LLVM Command Guide:
+        llvm/docs/CommandGuide/index.html
 
-	LLVM Assembly Language:
-		llvm/docs/LangRef.html
+    LLVM Assembly Language:
+        llvm/docs/LangRef.html
 
-	LLVM Test Suite Guide:
-		llvm/docs/TestingGuide.html
+    LLVM Test Suite Guide:
+        llvm/docs/TestingGuide.html
 
 LLVM Programming Documentation:
 
-	LLVM Programmers Manual:
-		llvm/docs/ProgrammersManual.html
+    LLVM Programmers Manual:
+        llvm/docs/ProgrammersManual.html
 
-	Writing an LLVM Pass:
-		llvm/docs/WritingAnLLVMPass.html
+    Writing an LLVM Pass:
+        llvm/docs/WritingAnLLVMPass.html
 
-	Alias Analysis in LLVM:
-		llvm/docs/AliasAnalysis.html
+    Alias Analysis in LLVM:
+        llvm/docs/AliasAnalysis.html
 
-	Command Line Library:
-		llvm/docs/CommandLine.html
+    Command Line Library:
+        llvm/docs/CommandLine.html
 
-	Coding Standards:
-		llvm/docs/CodingStandards.html
+    Coding Standards:
+        llvm/docs/CodingStandards.html
 
 Other LLVM Resources:
 
-	Submitting a Bug:
-		http://llvm.cs.uiuc.edu/docs/HowToSubmitABug.html
+    Submitting a Bug:
+        http://llvm.cs.uiuc.edu/docs/HowToSubmitABug.html
 
-	Open Projects:
-		llvm/docs/OpenProjects.html
+    Open Projects:
+        llvm/docs/OpenProjects.html
 
-	Creating a new LLVM Project:
-		llvm/docs/Projects.html
+    Creating a new LLVM Project:
+        llvm/docs/Projects.html
 
 Mailing Lists
 --------------
@@ -122,8 +121,8 @@ There are three mailing lists for providing LLVM users with information:
 (3) LLVM Commits List
     http://mail.cs.uiuc.edu/mailman/listinfo/llvm-commits
 
-   This list contains all commit messages that are made when LLVM developers
-   commit code changes to the CVS archive.  It is useful for those who want to
-   stay on the bleeding edge of LLVM development. This list is very high
-   volume.
+    This list contains all commit messages that are made when LLVM developers
+    commit code changes to the CVS archive.  It is useful for those who want to
+    stay on the bleeding edge of LLVM development. This list is very high
+    volume.