diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index c64f3a89..7ba9359b 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -75,12 +75,12 @@ module Jekyll
       },
 
       'kramdown' => {
-        'auto_ids'      => true,
-        'footnote_nr'   => 1,
-        'entity_output' => 'as_char',
-        'toc_levels'    => '1..6',
-        'smart_quotes'  => 'lsquo,rsquo,ldquo,rdquo',
-        'use_coderay'   => false,
+        'auto_ids'       => true,
+        'footnote_nr'    => 1,
+        'entity_output'  => 'as_char',
+        'toc_levels'     => '1..6',
+        'smart_quotes'   => 'lsquo,rsquo,ldquo,rdquo',
+        'enable_coderay' => false,
 
         'coderay' => {
           'coderay_wrap'              => 'div',
@@ -254,6 +254,12 @@ module Jekyll
         config[option].map!(&:to_s)
       end
 
+      if (config['kramdown'] || {}).key?('use_coderay')
+        Jekyll::Deprecator.deprecation_message "Please change 'use_coderay'" +
+          " to 'enable_coderay' in your configuration file."
+        config['kramdown']['use_coderay'] = config['kramdown'].delete('enable_coderay')
+      end
+
       if config.fetch('markdown', 'kramdown').to_s.downcase.eql?("maruku")
         Jekyll::Deprecator.deprecation_message "You're using the 'maruku' " +
           "Markdown processor. Maruku support has been deprecated and will " +
diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index 097c9212..a9dbec96 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -13,14 +13,14 @@ module Jekyll
 
         def convert(content)
           # Check for use of coderay
-          if @config['kramdown']['use_coderay']
+          if @config['kramdown']['enable_coderay']
             %w[wrap line_numbers line_numbers_start tab_width bold_every css default_lang].each do |opt|
               key = "coderay_#{opt}"
               @config['kramdown'][key] = @config['kramdown']['coderay'][key] unless @config['kramdown'].key?(key)
             end
           end
 
-          Kramdown::Document.new(content, Utils.symbolize_hash_keys(@config["kramdown"])).to_html
+          Kramdown::Document.new(content, Utils.symbolize_hash_keys(@config['kramdown'])).to_html
         end
 
       end
diff --git a/site/_docs/configuration.md b/site/_docs/configuration.md
index e4d55524..c9ddd915 100644
--- a/site/_docs/configuration.md
+++ b/site/_docs/configuration.md
@@ -527,12 +527,12 @@ redcarpet:
   extensions: []
 
 kramdown:
-  auto_ids:      true
-  footnote_nr:   1
-  entity_output: as_char
-  toc_levels:    1..6
-  smart_quotes:  lsquo,rsquo,ldquo,rdquo
-  use_coderay:   false
+  auto_ids:       true
+  footnote_nr:    1
+  entity_output:  as_char
+  toc_levels:     1..6
+  smart_quotes:   lsquo,rsquo,ldquo,rdquo
+  enable_coderay: false
 
   coderay:
     coderay_wrap:              div
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index f2bd8a0b..3998e9d3 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -14,7 +14,7 @@ class TestKramdown < Test::Unit::TestCase
           'toc_levels'    => '1..6',
           'smart_quotes'  => 'lsquo,rsquo,ldquo,rdquo',
 
-          'use_coderay'   => true,
+          'enable_coderay'   => true,
           'coderay_bold_every'=> 12,
           'coderay' => {
             'coderay_css'        => :style,