diff --git a/lib/jekyll/blocks.rb b/lib/jekyll/blocks.rb
index 70ae6b02..6e1549a2 100644
--- a/lib/jekyll/blocks.rb
+++ b/lib/jekyll/blocks.rb
@@ -8,7 +8,14 @@ module Jekyll
     end
   
     def render(context)
-      "<pre class='syntax-highlight:#{@lang}'>#{escape(super)}</pre>"
+      #The div is required because RDiscount blows ass
+      <<-HTML
+<div>
+  <pre>
+    <code class='#{@lang}'>#{h(super.to_s).strip}</code>
+  </pre>
+</div>
+      HTML
     end    
   end
 end