diff --git a/demo/kitchen-sink/doclist.js b/demo/kitchen-sink/doclist.js
index e4f4833b..7e3feb47 100644
--- a/demo/kitchen-sink/doclist.js
+++ b/demo/kitchen-sink/doclist.js
@@ -132,6 +132,7 @@ var docs = {
     "docs/toml.toml": "TOML",
     "docs/typescript.ts": "Typescript",
     "docs/vbscript.vbs": "VBScript",
+    "docs/velocity.vm": "Velocity",
     "docs/xml.xml": "XML",
     "docs/xquery.xq": "XQuery",
     "docs/yaml.yaml": "YAML",
diff --git a/demo/kitchen-sink/docs/velocity.vm b/demo/kitchen-sink/docs/velocity.vm
new file mode 100644
index 00000000..9156020b
--- /dev/null
+++ b/demo/kitchen-sink/docs/velocity.vm
@@ -0,0 +1,44 @@
+#*
+  This is a sample comment block that
+  spans multiple lines.
+*#
+
+#macro ( outputItem $item )
+  <li>${item}</li>
+#end
+
+## Define the items to iterate
+#set ( $items = [1, 2, 3, 4] )
+
+<ul>
+  ## Iterate over the items and output the evens.
+  #foreach ( $item in $items )
+    #if ( $_MathTool.mod($item, 2) == 0 )
+      #outputItem ($item)
+    #end
+  #end
+</ul>
+
+<script>
+  /*
+    A sample function to decomstrate
+    JavaScript highlighting and folding.
+  */
+  function foo(items, nada) {
+    for (var i=0; i<items.length; i++) {
+      alert(items[i] + "juhu\n");
+    }
+  }
+</script>
+
+<style>
+  /*
+    A sample style to decomstrate
+    CSS highlighting and folding.
+  */
+  .class {
+    font-family: Monaco, "Courier New", monospace;
+    font-size: 12px;
+    cursor: text;
+  }
+</style>
\ No newline at end of file
diff --git a/demo/kitchen-sink/modelist.js b/demo/kitchen-sink/modelist.js
index 9c693f99..4611e406 100644
--- a/demo/kitchen-sink/modelist.js
+++ b/demo/kitchen-sink/modelist.js
@@ -25,7 +25,7 @@ var Mode = function(name, desc, extensions) {
         }) + "$";
     } else {
         var re = "^.*\\.(" + extensions + ")$";
-    }   
+    }
 
     this.extRe = new RegExp(re, "gi");
 };
@@ -103,6 +103,7 @@ var modesByName = {
     toml:       ["toml"         , "toml"],
     typescript: ["Typescript"   , "typescript|ts|str"],
     vbscript:   ["VBScript"     , "vbs"],
+    velocity:   ["Velocity"     , "vm"],
     xml:        ["XML"          , "xml|rdf|rss|wsdl|xslt|atom|mathml|mml|xul|xbl"],
     xquery:     ["XQuery"       , "xq"],
     yaml:       ["YAML"         , "yaml"]