diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index 76374d2f..73e480dd 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -55,9 +55,10 @@ module Jekyll
     #   relative to the collection's directory
     def entries
       return Array.new unless exists?
-      Dir.glob(collection_dir("**", "*.*")).map do |entry|
-        entry[collection_dir("")] = ''; entry
-      end
+      @entries ||=
+        Dir.glob(collection_dir("**", "*.*")).map do |entry|
+          entry["#{collection_dir}/"] = ''; entry
+        end
     end
 
     # Filtered version of the entries in this collection.
@@ -66,9 +67,13 @@ module Jekyll
     # Returns a list of filtered entry paths.
     def filtered_entries
       return Array.new unless exists?
-      Dir.chdir(directory) do
-        entry_filter.filter(entries).reject { |f| File.directory?(f) }
-      end
+      @filtered_entries ||=
+        Dir.chdir(directory) do
+          entry_filter.filter(entries).reject do |f|
+            path = collection_dir(f)
+            File.directory?(path) || (File.symlink?(f) && site.safe)
+          end
+        end
     end
 
     # The directory for this Collection, relative to the site source.
diff --git a/test/test_collections.rb b/test/test_collections.rb
index 97b891ef..1975e402 100644
--- a/test/test_collections.rb
+++ b/test/test_collections.rb
@@ -187,6 +187,7 @@ class TestCollections < Test::Unit::TestCase
 
     should "not allow symlinks" do
       assert_not_include @collection.filtered_entries, "um_hi.md"
+      assert_not_include @collection.filtered_entries, "/um_hi.md"
     end
 
     should "not include the symlinked file in the list of docs" do