diff --git a/lib/Rewrite/HTMLRewrite.cpp b/lib/Rewrite/HTMLRewrite.cpp
index ad7e237..ca99c62 100644
--- a/lib/Rewrite/HTMLRewrite.cpp
+++ b/lib/Rewrite/HTMLRewrite.cpp
@@ -186,6 +186,7 @@
       " .code { font-family: \"Andale Mono\", monospace; font-size:10pt }\n"
       " .code { line-height: 1.2em }\n"
       " .comment { color: #A0A0A0 }\n"
+      " .keyword { color: #FF00FF }\n"
       " .macro { color: #FF0000; background-color:#FFC0C0 }\n"
       " .num { width:2.5em; padding-right:2ex; background-color:#eeeeee }\n"
       " .num { text-align:right; font-size: smaller }\n"
@@ -250,9 +251,15 @@
     unsigned TokOffs = LLocInfo.second;
     unsigned TokLen = Tok.getLength();
     switch (Tok.getKind()) {
-    default: break;
-      // FIXME: Add keywords here.
-        
+    default:
+      // If this is a pp-identifier, but not a real identifier it must be a
+      // keyword.
+      if (Tok.getIdentifierInfo() && Tok.isNot(tok::identifier)) {
+        RB.InsertTextAfter(TokOffs, "<span class='keyword'>",
+                           strlen("<span class='keyword'>"));
+        RB.InsertTextBefore(TokOffs+TokLen, "</span>", strlen("</span>"));
+      }
+      break;
     case tok::comment:
       RB.InsertTextAfter(TokOffs, "<span class='comment'>",
                          strlen("<span class='comment'>"));