diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index b4b404424d9..b38767228d5 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -405,6 +405,7 @@ def get_entries(dir, subfolder)
       base = File.join(self.source, dir, subfolder)
       return [] unless File.exists?(base)
       entries = Dir.chdir(base) { filter_entries(Dir['**/*']) }
+      entries.delete_if { |e| File.directory?(File.join(base, e)) }
     end
 
     # Aggregate post information
diff --git a/test/source/_posts/2013-03-19-not-a-post.markdown/.gitkeep b/test/source/_posts/2013-03-19-not-a-post.markdown/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/test_site.rb b/test/test_site.rb
index 6934596f566..558cd77996e 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -161,6 +161,7 @@ def generate(site)
     should "read posts" do
       @site.read_posts('')
       posts = Dir[source_dir('_posts', '*')]
+      posts.delete_if { |post| File.directory?(post) }
       assert_equal posts.size - 1, @site.posts.size
     end
 
@@ -169,9 +170,10 @@ def generate(site)
       @site.process
 
       posts = Dir[source_dir("**", "_posts", "*")]
+      posts.delete_if { |post| File.directory?(post) }
       categories = %w(bar baz category foo z_category publish_test win).sort
 
-      assert_equal posts.size - 1, @site.posts.size
+      assert_equal posts.size, @site.posts.size
       assert_equal categories, @site.categories.keys.sort
       assert_equal 4, @site.categories['foo'].size
     end