diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index fecd5828..386683d6 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -9,7 +9,7 @@ module Jekyll
 
     YAML_FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m
     DATELESS_FILENAME_MATCHER = %r!^(?:.+/)*(.*)(\.[^.]+)$!
-    DATE_FILENAME_MATCHER = %r!^(?:.+/)*(\d{4}-\d{2}-\d{2})-(.*)(\.[^.]+)$!
+    DATE_FILENAME_MATCHER = %r!^(?:.+/)*(\d{2,4}-\d{1,2}-\d{1,2})-(.*)(\.[^.]+)$!
 
     # Create a new Document.
     #
diff --git a/test/source/_posts/2017-2-5-i-dont-like-zeroes.md b/test/source/_posts/2017-2-5-i-dont-like-zeroes.md
new file mode 100644
index 00000000..95e11f12
--- /dev/null
+++ b/test/source/_posts/2017-2-5-i-dont-like-zeroes.md
@@ -0,0 +1,5 @@
+---
+foo: bar
+---
+I have an abbreviated date. Instead of "2017-02-05", I am instead "2017-2-5".
+Zeros have always seemed superfluous.
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 3a520b24..41e7c3a1 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -7,11 +7,14 @@ class TestGeneratedSite < JekyllUnitTest
 
       @site = fixture_site
       @site.process
-      @index = File.read(dest_dir("index.html"))
+      @index = File.read(
+        dest_dir("index.html"),
+        Utils.merged_file_read_opts(@site, {})
+      )
     end
 
     should "ensure post count is as expected" do
-      assert_equal 51, @site.posts.size
+      assert_equal 52, @site.posts.size
     end
 
     should "insert site.posts into the index" do
@@ -48,6 +51,13 @@ class TestGeneratedSite < JekyllUnitTest
       assert_exist dest_dir("dynamic_file.php")
     end
 
+    should "include a post with a abbreviated dates" do
+      refute_nil @site.posts.index { |post|
+        post.relative_path == "_posts/2017-2-5-i-dont-like-zeroes.md"
+      }
+      assert_exist dest_dir("2017", "02", "05", "i-dont-like-zeroes.html")
+    end
+
     should "print a nice list of static files" do
       time_regexp = "\\d+:\\d+"
       #