diff --git a/lib/Frontend/PrintPreprocessedOutput.cpp b/lib/Frontend/PrintPreprocessedOutput.cpp
index 6d7a1db..3cef68d 100644
--- a/lib/Frontend/PrintPreprocessedOutput.cpp
+++ b/lib/Frontend/PrintPreprocessedOutput.cpp
@@ -419,7 +419,7 @@
     OS << Namespace << ' ';
   switch (Kind) {
     case PMK_Message:
-      OS << "message \"";
+      OS << "message(\"";
       break;
     case PMK_Warning:
       OS << "warning \"";
@@ -440,6 +440,8 @@
          << (char)('0'+ ((Char >> 0) & 7));
   }
   OS << '"';
+  if (Kind == PMK_Message)
+    OS << ')';
   setEmittedDirectiveOnThisLine();
 }