diff --git a/tools/llvm-dis/Makefile b/tools/llvm-dis/Makefile
index 4409a177676..0238dd2a178 100644
--- a/tools/llvm-dis/Makefile
+++ b/tools/llvm-dis/Makefile
@@ -1,5 +1,5 @@
 LEVEL = ../..
 
-TOOLNAME = dis
+TOOLNAME = llvm-dis
 USEDLIBS = bcreader cwriter ipa.a vmcore support.a
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-dis/dis.cpp b/tools/llvm-dis/dis.cpp
index bf46fe62e3f..1a4a46b8b91 100644
--- a/tools/llvm-dis/dis.cpp
+++ b/tools/llvm-dis/dis.cpp
@@ -2,9 +2,9 @@
 // LLVM 'DIS' UTILITY 
 //
 // This utility may be invoked in the following manner:
-//  dis [options]      - Read LLVM bytecode from stdin, write assembly to stdout
-//  dis [options] x.bc - Read LLVM bytecode from the x.bc file, write assembly
-//                       to the x.ll file.
+//  llvm-dis [options]      - Read LLVM bytecode from stdin, write asm to stdout
+//  llvm-dis [options] x.bc - Read LLVM bytecode from the x.bc file, write asm
+//                            to the x.ll file.
 //  Options:
 //      --help   - Output information about command line switches
 //       -c      - Print C code instead of LLVM assembly
@@ -39,8 +39,7 @@ Force("f", cl::desc("Overwrite output files"));
 
 static cl::opt<enum OutputMode>
 WriteMode(cl::desc("Specify the output format:"),
-          cl::values(
-                     clEnumVal(llvm, "Output LLVM assembly"),
+          cl::values(clEnumVal(llvm, "Output LLVM assembly"),
                      clEnumVal(c   , "Output C code for program"),
                     0));
 
diff --git a/tools/llvm-dis/llvm-dis.cpp b/tools/llvm-dis/llvm-dis.cpp
index bf46fe62e3f..1a4a46b8b91 100644
--- a/tools/llvm-dis/llvm-dis.cpp
+++ b/tools/llvm-dis/llvm-dis.cpp
@@ -2,9 +2,9 @@
 // LLVM 'DIS' UTILITY 
 //
 // This utility may be invoked in the following manner:
-//  dis [options]      - Read LLVM bytecode from stdin, write assembly to stdout
-//  dis [options] x.bc - Read LLVM bytecode from the x.bc file, write assembly
-//                       to the x.ll file.
+//  llvm-dis [options]      - Read LLVM bytecode from stdin, write asm to stdout
+//  llvm-dis [options] x.bc - Read LLVM bytecode from the x.bc file, write asm
+//                            to the x.ll file.
 //  Options:
 //      --help   - Output information about command line switches
 //       -c      - Print C code instead of LLVM assembly
@@ -39,8 +39,7 @@ Force("f", cl::desc("Overwrite output files"));
 
 static cl::opt<enum OutputMode>
 WriteMode(cl::desc("Specify the output format:"),
-          cl::values(
-                     clEnumVal(llvm, "Output LLVM assembly"),
+          cl::values(clEnumVal(llvm, "Output LLVM assembly"),
                      clEnumVal(c   , "Output C code for program"),
                     0));