diff --git a/lib/Linker/LinkArchives.cpp b/lib/Linker/LinkArchives.cpp
index 59570526e18..0d0dc9fabaa 100644
--- a/lib/Linker/LinkArchives.cpp
+++ b/lib/Linker/LinkArchives.cpp
@@ -1,15 +1,7 @@
-//===- gccld.cpp - LLVM 'ld' compatible linker ----------------------------===//
+//===- Linker.cpp - Link together LLVM objects and libraries --------------===//
 //
-// This utility is intended to be compatible with GCC, and follows standard
-// system 'ld' conventions.  As such, the default output file is ./a.out.
-// Additionally, this program outputs a shell script that is used to invoke LLI
-// to execute the program.  In this manner, the generated executable (a.out for
-// example), is directly executable, whereas the bytecode file actually lives in
-// the a.out.bc file generated by this program.  Also, Force is on by default.
-//
-// Note that if someone (or a script) deletes the executable program generated,
-// the .bc file will be left around.  Considering that this is a temporary hack,
-// I'm not too worried about this.
+// This file contains routines to handle linking together LLVM bytecode files,
+// and to handle annoying things like static libraries.
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/tools/gccld/GenerateCode.cpp b/tools/gccld/GenerateCode.cpp
index 09583df8d18..7660be5dd89 100644
--- a/tools/gccld/GenerateCode.cpp
+++ b/tools/gccld/GenerateCode.cpp
@@ -1,4 +1,4 @@
-//===- gencode.cpp - Functions for generating executable files  -----------===//
+//===- GenerateCode.cpp - Functions for generating executable files  ------===//
 //
 // This file contains functions for generating executable files once linking
 // has finished.  This includes generating a shell script to run the JIT or
diff --git a/tools/gccld/Linker.cpp b/tools/gccld/Linker.cpp
index 59570526e18..0d0dc9fabaa 100644
--- a/tools/gccld/Linker.cpp
+++ b/tools/gccld/Linker.cpp
@@ -1,15 +1,7 @@
-//===- gccld.cpp - LLVM 'ld' compatible linker ----------------------------===//
+//===- Linker.cpp - Link together LLVM objects and libraries --------------===//
 //
-// This utility is intended to be compatible with GCC, and follows standard
-// system 'ld' conventions.  As such, the default output file is ./a.out.
-// Additionally, this program outputs a shell script that is used to invoke LLI
-// to execute the program.  In this manner, the generated executable (a.out for
-// example), is directly executable, whereas the bytecode file actually lives in
-// the a.out.bc file generated by this program.  Also, Force is on by default.
-//
-// Note that if someone (or a script) deletes the executable program generated,
-// the .bc file will be left around.  Considering that this is a temporary hack,
-// I'm not too worried about this.
+// This file contains routines to handle linking together LLVM bytecode files,
+// and to handle annoying things like static libraries.
 //
 //===----------------------------------------------------------------------===//