diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index b892a31a..b0dcbb06 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -325,14 +325,7 @@ module Jekyll
     #
     # Returns the Array of filtered entries.
     def filter_entries(entries)
-      entries.reject do |e|
-        unless self.include.glob_include?(e)
-          ['.', '_', '#'].include?(e[0..0]) ||
-          e[-1..-1] == '~' ||
-          self.exclude.glob_include?(e) ||
-          (File.symlink?(e) && self.safe)
-        end
-      end
+      EntryFilter.new(self).filter(entries)
     end
 
     # Get the implementation class for the given Converter.