diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 981f8ed8..6e029437 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -79,7 +79,17 @@ module Jekyll
       'auto_ids'      => true,
       'footnote_nr'   => 1,
       'entity_output' => 'as_char',
-      'toc_levels'    => '1..6'
+      'toc_levels'    => '1..6',
+      'use_coderay'   => false,
+
+      'coderay' => {
+        'coderay_wrap'              => 'div',
+        'coderay_line_numbers'      => 'inline',
+        'coderay_line_number_start' => 1,
+        'coderay_tab_width'         => 4,
+        'coderay_bold_every'        => 10,
+        'coderay_css'               => 'style'
+      }
     }
   }
 
diff --git a/lib/jekyll/converters/markdown.rb b/lib/jekyll/converters/markdown.rb
index 4e3110e5..05ddb622 100644
--- a/lib/jekyll/converters/markdown.rb
+++ b/lib/jekyll/converters/markdown.rb
@@ -79,12 +79,33 @@ module Jekyll
       setup
       case @config['markdown']
         when 'kramdown'
-          Kramdown::Document.new(content, {
-			  :auto_ids      => @config['kramdown']['auto_ids'],
-			  :footnote_nr   => @config['kramdown']['footnote_nr'],
-			  :entity_output => @config['kramdown']['entity_output'],
-			  :toc_levels    => @config['kramdown']['toc_levels']
-			  }).to_html
+
+	  # Check for use of coderay
+	  if @config['kramdown']['use_coderay']
+            Kramdown::Document.new(content, {
+		  :auto_ids      => @config['kramdown']['auto_ids'],
+		  :footnote_nr   => @config['kramdown']['footnote_nr'],
+		  :entity_output => @config['kramdown']['entity_output'],
+		  :toc_levels    => @config['kramdown']['toc_levels'],
+
+		  :coderay_wrap               => @config['kramdown']['coderay']['coderay_wrap'],
+		  :coderay_line_numbers       => @config['kramdown']['coderay']['coderay_line_numbers'],
+		  :coderay_line_number_start  => @config['kramdown']['coderay']['coderay_line_number_start'],
+		  :coderay_tab_width          => @config['kramdown']['coderay']['coderay_tab_width'],
+		  :coderay_bold_every         => @config['kramdown']['coderay']['coderay_bold_every'],
+		  :coderay_css                => @config['kramdown']['coderay']['coderay_css']
+		  }).to_html
+
+	  # not using coderay
+	  else
+
+            Kramdown::Document.new(content, {
+		  :auto_ids      => @config['kramdown']['auto_ids'],
+		  :footnote_nr   => @config['kramdown']['footnote_nr'],
+		  :entity_output => @config['kramdown']['entity_output'],
+		  :toc_levels    => @config['kramdown']['toc_levels']
+		  }).to_html
+          end
         when 'rdiscount'
           RDiscount.new(content, *@rdiscount_extensions).to_html
         when 'maruku'