diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 62b00132..24b9f9c7 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -65,7 +65,7 @@ module Jekyll
     'markdown'     => 'maruku',
     'permalink'    => 'date',
     
-    'markdown_ext' => 'markdown,mdw,mdwn,md',
+    'markdown_ext' => 'markdown,mkd,mkdn,md',
     'textile_ext'  => 'textile',
 
     'maruku'       => {
diff --git a/test/test_post.rb b/test/test_post.rb
index d63a9f0d..d0fbdf85 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -419,7 +419,7 @@ class TestPost < Test::Unit::TestCase
     end
     
     should "process .md as markdown under alternate configuration" do
-      @site.config['markdown_ext'] = 'markdown,mdw,mdwn,md,text'
+      @site.config['markdown_ext'] = 'markdown,mkd,mkdn,md,text'
       post = setup_post '2011-04-12-text-extension.text'
       conv = post.converter
       assert conv.kind_of? Jekyll::MarkdownConverter