diff --git a/src/lexer.rs b/src/lexer.rs
index 53d54906a..fe6512598 100644
--- a/src/lexer.rs
+++ b/src/lexer.rs
@@ -103,6 +103,7 @@ fn granularize(block: &str) -> Result<Vec<Token>> {
             "?" => Question,
             "-" => Dash,
             "=" => Assignment,
+            "or" => Or,
 
             "==" => Comparison(Equals),
             "!=" => Comparison(NotEquals),
diff --git a/src/lib.rs b/src/lib.rs
index 6105a6a0b..81f04b184 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -43,7 +43,7 @@ extern crate regex;
 use std::collections::HashMap;
 use lexer::Element;
 use tags::{assign_tag, cycle_tag, include_tag, break_tag, continue_tag,
-           comment_block, raw_block, for_block, if_block, unless_block, capture_block};
+           comment_block, raw_block, for_block, if_block, unless_block, capture_block, case_block};
 use std::default::Default;
 use std::path::PathBuf;
 use error::Result;
@@ -161,6 +161,7 @@ impl LiquidOptions {
         self.register_block("for",     Box::new(for_block));
         self.register_block("comment", Box::new(comment_block));
         self.register_block("capture", Box::new(capture_block));
+        self.register_block("case",    Box::new(case_block));
     }
 
     pub fn register_block(&mut self, name: &str, block: Box<Block>) {
diff --git a/src/parser.rs b/src/parser.rs
index 89e7064e4..c430bf919 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -308,4 +308,4 @@ mod test {
             None => panic!("split failed")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/tags/case_block.rs b/src/tags/case_block.rs
new file mode 100644
index 000000000..79a848774
--- /dev/null
+++ b/src/tags/case_block.rs
@@ -0,0 +1,216 @@
+use Renderable;
+use LiquidOptions;
+use error::{Error, Result};
+use context::{Context};
+use lexer::Element::{self, Tag};
+use token::Token::{self, Or, Identifier};
+use parser::{parse, consume_value_token, split_block};
+
+use template::Template;
+use value::Value;
+
+struct CaseOption {
+    tokens: Vec<Token>,
+    template: Template
+}
+
+impl CaseOption {
+    fn new(tokens: Vec<Token>, template: Template) -> CaseOption {
+        CaseOption { tokens: tokens, template: template }
+    }
+
+    fn evaluate(&self, value: &Value, context: &Context) -> Result<bool> {
+        for t in &self.tokens {
+            match try!(context.evaluate(&t)) {
+                Some(ref v) if *v == *value => { return Ok(true) },
+                _ => {}
+            }
+        }
+        Ok(false)
+    }
+}
+
+struct Case {
+    target: Token,
+    cases: Vec<CaseOption>,
+    else_block: Option<Template>
+}
+
+impl Renderable for Case {
+    fn render(&self, context: &mut Context) -> Result<Option<String>> {
+        if let Some(value) = try!(context.evaluate(&self.target)) {
+            for case in &self.cases {
+                if try!(case.evaluate(&value, context)) {
+                    return case.template.render(context)
+                }
+            }
+        }
+
+        if let Some(ref t) = self.else_block {
+            return t.render(context)
+        }
+
+        Ok(None)
+    }
+}
+
+enum Conditional {
+    Cond (Vec<Token>),
+    Else
+}
+
+fn parse_condition(element: &Element) -> Result<Conditional> {
+    if let &Tag(ref tokens, _) = element { 
+        match tokens[0] {
+            Identifier(ref name) if name == "else" => {
+                return Ok(Conditional::Else)
+            },
+
+            Identifier(ref name) if name == "when" => {
+                let mut values : Vec<Token> = Vec::new();
+                let mut args = tokens[1..].iter();
+
+                values.push(try!(consume_value_token(&mut args)));
+
+                loop {
+                    match args.next() {
+                        Some(&Or) => {},
+                        Some(x) => return Error::parser("or", Some(x)),
+                        None => break
+                    }
+
+                    values.push(try!(consume_value_token(&mut args)))
+                };
+
+                return Ok(Conditional::Cond(values));
+            },
+
+            ref x => return Error::parser("else | when", Some(&x))
+        }
+    } else {
+        Err(Error::Parser("Expected else | when".to_owned()))
+    }
+}
+
+pub fn case_block(_tag_name: &str,
+                  arguments: &[Token],
+                  tokens: Vec<Element>,
+                  options: &LiquidOptions) -> Result<Box<Renderable>> {
+    let delims = &["when", "else"];
+    let mut args = arguments.iter();
+    let value = try!(consume_value_token(&mut args));
+
+    // fast forward to the first arm of the case block, 
+    let mut children = match split_block(&tokens[..], delims, options) {
+        (_, Some(split)) => split.trailing,
+        _ => return Err(Error::Parser("Expected case | else".to_owned()))
+    };
+
+    let mut result = Case {
+        target: value,
+        cases: Vec::new(),
+        else_block: None
+    };
+ 
+    loop {
+        let (leading, trailing) = split_block(&children[1..], delims, options);
+        let template = Template::new(try!(parse(leading, options)));
+
+        match try!(parse_condition(&children[0])) {
+            Conditional::Cond(conds) => {
+                result.cases.push(CaseOption::new(conds, template));
+            },
+            Conditional::Else => {
+                if result.else_block.is_none() {
+                    result.else_block = Some(template) 
+                } else {
+                    return Err(Error::Parser(
+                        "Only one else block allowed".to_owned()));
+                }
+            }
+        }
+
+        match trailing {
+            Some(split) => children = split.trailing,
+            None => break
+        }
+    }
+
+    Ok(Box::new(result))
+}
+
+#[cfg(test)]
+mod test {
+    use LiquidOptions;
+    use Renderable;
+    use parse;
+    use value::Value;
+    use context::Context;
+
+    #[test]
+    fn test_case_block() {
+        let text = concat!(
+            "{% case x %}",
+            "{% when 2 %}",
+                "two",
+            "{% when 3 or 4 %}",
+                "three and a half",
+            "{% else %}",
+                "otherwise",
+            "{% endcase %}"
+        );
+
+        let template = parse(text, LiquidOptions::default()).unwrap();
+        let mut context = Context::new();
+        context.set_val("x", Value::Num(2f32));
+        assert_eq!(template.render(&mut context).unwrap(),
+                   Some("two".to_owned()));
+
+        context.set_val("x", Value::Num(3f32));
+        assert_eq!(template.render(&mut context).unwrap(),
+                   Some("three and a half".to_owned()));
+
+        context.set_val("x", Value::Num(4f32));
+        assert_eq!(template.render(&mut context).unwrap(),
+                   Some("three and a half".to_owned()));
+
+
+        context.set_val("x", Value::str("nope"));
+        assert_eq!(template.render(&mut context).unwrap(),
+                   Some("otherwise".to_owned()));
+    }
+
+    #[test]
+    fn test_no_matches_returns_empty_string() {
+    	let text = concat!(
+            "{% case x %}",
+            "{% when 2 %}",
+                "two",
+            "{% when 3 or 4 %}",
+                "three and a half",
+            "{% endcase %}"
+        );
+
+        let template = parse(text, LiquidOptions::default()).unwrap();
+        let mut context = Context::new();
+        context.set_val("x", Value::str("nope"));
+        assert_eq!(template.render(&mut context).unwrap(),
+                   Some("".to_owned()));
+    }
+
+    #[test]
+    fn multiple_else_blocks_is_an_error() {
+        let text = concat!(
+            "{% case x %}",
+            "{% when 2 %}",
+                "two",
+            "{% else %}",
+                "else #1",
+            "{% else %}",
+                "else # 2",
+            "{% endcase %}"
+        );
+
+        assert!(parse(text, LiquidOptions::default()).is_err());
+    }
+}
\ No newline at end of file
diff --git a/src/tags/mod.rs b/src/tags/mod.rs
index fca86ee13..461b81e29 100644
--- a/src/tags/mod.rs
+++ b/src/tags/mod.rs
@@ -1,5 +1,6 @@
 mod assign_tag;
 mod capture_block;
+mod case_block;
 mod comment_block;
 mod for_block;
 mod if_block;
@@ -9,6 +10,7 @@ mod raw_block;
 mod cycle_tag;
 
 pub use self::assign_tag::assign_tag;
+pub use self::case_block::case_block;
 pub use self::capture_block::capture_block;
 pub use self::comment_block::comment_block;
 pub use self::cycle_tag::cycle_tag;
diff --git a/src/token.rs b/src/token.rs
index 37b62f662..90c38c225 100644
--- a/src/token.rs
+++ b/src/token.rs
@@ -26,13 +26,13 @@ pub enum Token {
     Question,
     Dash,
     Assignment,
-
     Identifier(String),
     StringLiteral(String),
     NumberLiteral(f32),
     BooleanLiteral(bool),
     DotDot,
-    Comparison(ComparisonOperator),
+    Comparison(ComparisonOperator),	
+    Or
 }
 
 impl fmt::Display for Token {
@@ -50,6 +50,7 @@ impl fmt::Display for Token {
             Dash => "-".to_owned(),
             DotDot => "..".to_owned(),
             Assignment => "=".to_owned(),
+            Or => "or".to_owned(),
 
             Comparison(Equals) => "==".to_owned(),
             Comparison(NotEquals) => "!=".to_owned(),