diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index a124a8a8..42350643 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -169,7 +169,7 @@ module Jekyll
           "i_day"      => date.strftime("%d").to_i.to_s,
           "i_month"    => date.strftime("%m").to_i.to_s,
           "categories" => categories.map { |c| URI.escape(c.to_s) }.join('/'),
-          "abrv_month" => date.strftime("%b"),
+          "short_month" => date.strftime("%b"),
           "output_ext" => self.output_ext
         }.inject(template) { |result, token|
           result.gsub(/:#{Regexp.escape token.first}/, token.last)
diff --git a/test/test_post.rb b/test/test_post.rb
index 63f68306..8a9721e4 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -227,7 +227,7 @@ class TestPost < Test::Unit::TestCase
 
         context "with custom abbreviated month date permalink" do
           setup do
-            @post.site.permalink_style = '/:categories/:year/:abrv_month/:day/:title/'
+            @post.site.permalink_style = '/:categories/:year/:short_month/:day/:title/'
             @post.process(@fake_file)
           end