diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 932ea01c..be275d88 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -169,7 +169,7 @@ module Jekyll
       base = File.join(self.source, dir)
       entries = filter_entries(Dir.entries(base))
       directories = entries.select { |e| File.directory?(File.join(base, e)) }
-      files = entries.reject { |e| File.directory?(File.join(base, e)) }
+      files = entries.reject { |e| File.directory?(File.join(base, e)) || File.symlink?(File.join(base, e)) }
 
       # we need to make sure to process _posts *first* otherwise they
       # might not be available yet to other templates as {{ site.posts }}
@@ -177,7 +177,7 @@ module Jekyll
         directories.delete('_posts')
         read_posts(dir)
       end
-      
+
       [directories, files].each do |entries|
         entries.each do |f|
           if File.directory?(File.join(base, f))
@@ -187,7 +187,6 @@ module Jekyll
             paginate_posts(f, dir)
           else
             first3 = File.open(File.join(self.source, dir, f)) { |fd| fd.read(3) }
-
             if first3 == "---"
               # file appears to have a YAML header so process it as a page
               page = Page.new(self, self.source, dir, f)