diff --git a/History.txt b/History.txt
index 07e3efee..8c821b9b 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,7 @@
+== Edge
+  * Bug Fixes
+    * Render highlighted code for non markdown/textile pages (#116)
+
 == 0.5.7 / 2010-01-12
   * Minor Enhancements
     * Allow overriding of post date in the front matter (#62, #38)
diff --git a/lib/jekyll/tags/highlight.rb b/lib/jekyll/tags/highlight.rb
index 93d94868..1fa9982c 100644
--- a/lib/jekyll/tags/highlight.rb
+++ b/lib/jekyll/tags/highlight.rb
@@ -31,10 +31,10 @@ module Jekyll
 
     def render_pygments(context, code)
       output = add_code_tags(Albino.new(code, @lang).to_s(@options), @lang)
-      if context["content_type"] == "markdown"
-        return "\n" + output + "\n"
-      elsif context["content_type"] == "textile"
-        return "<notextile>" + output + "</notextile>"
+      case context["content_type"]
+        when "markdown" then "\n" + output + "\n"
+        when "textile" then "<notextile>" + output + "</notextile>"
+        else output
       end
     end