diff --git a/contrib/geshi/chaiscript.php b/contrib/geshi/chaiscript.php
index d1fd89c..1fc6dea 100644
--- a/contrib/geshi/chaiscript.php
+++ b/contrib/geshi/chaiscript.php
@@ -48,7 +48,7 @@ $language_data = array (
     'ESCAPE_CHAR' => '\\',
     'KEYWORDS' => array(
         1 => array(
-            'break', 'else', 'else if', 'eval', 'for', 'if', 'return', 'while', 'try', 'catch', 'finally',
+            'break', 'else', 'else if', 'eval', 'for', 'if', 'return', 'while', 'try', 'catch', 'finally', 'switch', 'case', 'default',
             ),
         2 => array(
             'def', 'false', 'fun', 'true', 'var', 'auto', 'attr',
diff --git a/contrib/vim/syntax/chaiscript.vim b/contrib/vim/syntax/chaiscript.vim
index dc89d84..e78b4c1 100644
--- a/contrib/vim/syntax/chaiscript.vim
+++ b/contrib/vim/syntax/chaiscript.vim
@@ -42,7 +42,7 @@ syn match  chaiscriptNumber        "\<0b[01]\+\>"
 " Various language features
 syn keyword chaiscriptCond         if else
 syn keyword chaiscriptRepeat       while for do
-syn keyword chaiscriptStatement    break continue return
+syn keyword chaiscriptStatement    break continue return switch case default
 syn keyword chaiscriptExceptions   try catch throw
 
 "Keyword