diff --git a/lib/Rewrite/HTMLRewrite.cpp b/lib/Rewrite/HTMLRewrite.cpp
index ced8e5e..ddf6cbe 100644
--- a/lib/Rewrite/HTMLRewrite.cpp
+++ b/lib/Rewrite/HTMLRewrite.cpp
@@ -451,11 +451,12 @@
       }
       
       LineLen -= Expansion.size();
-      Expansion += ' ' + PP->getSpelling(Tok);
+      // Escape any special characters in the token text.
+      Expansion += ' ' + EscapeText(PP->getSpelling(Tok));
       LineLen += Expansion.size();
       PP->Lex(Tok);
     }
-
+    
     // Insert the information about the expansion inside the macro span.
     Expansion = "<span class='expansion'>" + Expansion + "</span>";
     RB.InsertTextBefore(TokOffs+TokLen, Expansion.c_str(), Expansion.size());