diff --git a/clang/include/clang/Checker/PathDiagnosticClients.h b/clang/include/clang/Checker/PathDiagnosticClients.h
index b9d6eee66aa5..a0360102e7d8 100644
--- a/clang/include/clang/Checker/PathDiagnosticClients.h
+++ b/clang/include/clang/Checker/PathDiagnosticClients.h
@@ -28,5 +28,9 @@ PathDiagnosticClient*
 createPlistDiagnosticClient(const std::string& prefix, const Preprocessor &PP,
                             PathDiagnosticClient *SubPD = 0);
 
+PathDiagnosticClient*
+createTextPathDiagnosticClient(const std::string& prefix,
+                               const Preprocessor &PP);
+
 } // end clang namespace
 #endif
diff --git a/clang/include/clang/Frontend/Analyses.def b/clang/include/clang/Frontend/Analyses.def
index e9fd6e742c04..9ffc122a92fa 100644
--- a/clang/include/clang/Frontend/Analyses.def
+++ b/clang/include/clang/Frontend/Analyses.def
@@ -76,6 +76,7 @@ ANALYSIS_CONSTRAINTS(RangeConstraints, "range", "Use constraint tracking of conc
 ANALYSIS_DIAGNOSTICS(HTML,  "html",  "Output analysis results using HTML",   createHTMLDiagnosticClient, false)
 ANALYSIS_DIAGNOSTICS(PLIST, "plist", "Output analysis results using Plists", createPlistDiagnosticClient, true)
 ANALYSIS_DIAGNOSTICS(PLIST_HTML, "plist-html", "Output analysis results using HTML wrapped with Plists", createPlistHTMLDiagnosticClient, true)
+ANALYSIS_DIAGNOSTICS(TEXT, "text", "Text output of analysis results", createTextPathDiagnosticClient, true)
 
 #undef ANALYSIS
 #undef ANALYSIS_STORE
diff --git a/clang/lib/Checker/CMakeLists.txt b/clang/lib/Checker/CMakeLists.txt
index 73e8d119dcb4..24383662f31c 100644
--- a/clang/lib/Checker/CMakeLists.txt
+++ b/clang/lib/Checker/CMakeLists.txt
@@ -74,6 +74,7 @@ add_clang_library(clangChecker
   Store.cpp
   StreamChecker.cpp
   SymbolManager.cpp
+  TextPathDiagnostics.cpp
   UndefBranchChecker.cpp
   UndefCapturedBlockVarChecker.cpp
   UndefResultChecker.cpp
diff --git a/clang/lib/Checker/TextPathDiagnostics.cpp b/clang/lib/Checker/TextPathDiagnostics.cpp
new file mode 100644
index 000000000000..03c6088027a2
--- /dev/null
+++ b/clang/lib/Checker/TextPathDiagnostics.cpp
@@ -0,0 +1,80 @@
+//===--- TextPathDiagnostics.cpp - Text Diagnostics for Paths ---*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+//  This file defines the TextPathDiagnostics object.
+//
+//===----------------------------------------------------------------------===//
+
+#include "clang/Checker/PathDiagnosticClients.h"
+#include "clang/Checker/BugReporter/PathDiagnostic.h"
+#include "clang/Lex/Preprocessor.h"
+#include "llvm/Support/raw_ostream.h"
+using namespace clang;
+using namespace llvm;
+
+namespace {
+
+/// \brief Simple path diagnostic client used for outputting as text
+/// the sequence of events.
+class TextPathDiagnostics : public PathDiagnosticClient {
+  const std::string OutputFile;
+  Diagnostic &Diag;
+
+public:
+  TextPathDiagnostics(const std::string& output, Diagnostic &diag)
+    : OutputFile(output), Diag(diag) {}
+
+  void HandlePathDiagnostic(const PathDiagnostic* D);
+
+  void FlushDiagnostics(llvm::SmallVectorImpl<std::string> *FilesMade) { }
+  
+  virtual llvm::StringRef getName() const {
+    return "TextPathDiagnostics";
+  }
+
+  PathGenerationScheme getGenerationScheme() const { return Extensive; }
+  bool supportsLogicalOpControlFlow() const { return true; }
+  bool supportsAllBlockEdges() const { return true; }
+  virtual bool useVerboseDescription() const { return true; }
+};
+
+} // end anonymous namespace
+
+PathDiagnosticClient*
+clang::createTextPathDiagnosticClient(const std::string& out,
+                                      const Preprocessor &PP) {
+  return new TextPathDiagnostics(out, PP.getDiagnostics());
+}
+
+void TextPathDiagnostics::HandlePathDiagnostic(const PathDiagnostic* D) {
+  if (!D)
+    return;
+
+  if (D->empty()) {
+    delete D;
+    return;
+  }
+
+  // Open the file.
+  std::string ErrMsg;
+  llvm::raw_fd_ostream o(OutputFile.c_str(), ErrMsg);
+  if (!ErrMsg.empty()) {
+    llvm::errs() << "warning: could not create file: " << OutputFile << '\n';
+    return;
+  }
+
+  for (PathDiagnostic::const_iterator I=D->begin(), E=D->end(); I != E; ++I) {
+    if (isa<PathDiagnosticEventPiece>(*I)) {
+      PathDiagnosticEventPiece &event = cast<PathDiagnosticEventPiece>(*I);
+      unsigned diagID = Diag.getDiagnosticIDs()->getCustomDiagID(
+                                        DiagnosticIDs::Note, event.getString());
+      Diag.Report(event.getLocation().asLocation(), diagID);
+    }
+  }
+}