diff --git a/tools/llvm-dis/llvm-dis.cpp b/tools/llvm-dis/llvm-dis.cpp
index 6065e9ba5e7..12a53285c0a 100644
--- a/tools/llvm-dis/llvm-dis.cpp
+++ b/tools/llvm-dis/llvm-dis.cpp
@@ -60,12 +60,8 @@ int main(int argc, char **argv) {
     std::auto_ptr<Module> M;
    
     if (Bitcode) {
-      MemoryBuffer *Buffer;
-      if (InputFilename == "-") {
-        Buffer = MemoryBuffer::getSTDIN();
-      } else {
-        Buffer = MemoryBuffer::getFile(&InputFilename[0], InputFilename.size());
-      }
+      MemoryBuffer *Buffer
+        = MemoryBuffer::getFileOrSTDIN(&InputFilename[0], InputFilename.size());
 
       if (Buffer == 0)
         ErrorMessage = "Error reading file '" + InputFilename + "'";