diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index 3ad60eaff516..2be3c9cff25b 100644
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@@ -272,3 +272,6 @@ if( CLANG_BUILT_STANDALONE AND MSVC_VERSION EQUAL 1600 )
     file(APPEND "${CLANG_SLN_FILENAME}" "\n# This should be regenerated!\n")
   endif()
 endif()
+
+set(BUG_REPORT_URL "http://llvm.org/bugs/" CACHE STRING
+  "Default URL where bug reports are to be submitted.")
diff --git a/clang/include/clang/Config/config.h.cmake b/clang/include/clang/Config/config.h.cmake
index d70a151b2716..c53e5eb9e701 100644
--- a/clang/include/clang/Config/config.h.cmake
+++ b/clang/include/clang/Config/config.h.cmake
@@ -15,3 +15,6 @@
 
 /* Directories clang will search for headers. */
 #define C_INCLUDE_DIRS "${C_INCLUDE_DIRS}"
+
+/* Define default bug reporting URL. */
+#define BUG_REPORT_URL "${BUG_REPORT_URL}"
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 9ecfb7c5ba2e..fc2ec673e3fd 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -373,8 +373,8 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
 void Driver::generateCompilationDiagnostics(Compilation &C,
                                             const Command *FailingCommand) {
   Diag(clang::diag::note_drv_command_failed_diag_msg)
-    << "Please submit a bug report and include command line arguments and "
-    "all diagnostic information.";
+    << "Please submit a bug report to " BUG_REPORT_URL " and include command"
+    " line arguments and all diagnostic information.";
 
   // Suppress driver output and emit preprocessor output to temp file.
   CCCIsCPP = true;