diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index ab948552d9..b4693f2ac9 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -412,6 +412,9 @@ void Driver::PrintHelp(bool ShowHidden) const {
 void Driver::PrintVersion(const Compilation &C, llvm::raw_ostream &OS) const {
   // FIXME: The following handlers should use a callback mechanism, we don't
   // know what the client would like to do.
+#ifdef CLANG_VENDOR
+  OS << CLANG_VENDOR;
+#endif
   OS << "clang version " CLANG_VERSION_STRING " ("
      << getClangSubversionPath();
   if (unsigned Revision = getClangSubversionRevision())
diff --git a/lib/Driver/Makefile b/lib/Driver/Makefile
index dbacf8be01..4c3ca5ca84 100644
--- a/lib/Driver/Makefile
+++ b/lib/Driver/Makefile
@@ -13,5 +13,8 @@ BUILD_ARCHIVE = 1
 CXXFLAGS = -fno-rtti
 
 CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+ifdef CLANG_VENDOR
+CPPFLAGS += -DCLANG_VENDOR='"$(CLANG_VENDOR) "'
+endif
 
 include $(LEVEL)/Makefile.common