diff --git a/lib/jekyll/tags/link.rb b/lib/jekyll/tags/link.rb
index 6ffd4726..03e2e52b 100644
--- a/lib/jekyll/tags/link.rb
+++ b/lib/jekyll/tags/link.rb
@@ -16,8 +16,8 @@ module Jekyll
       def render(context)
         site = context.registers[:site]
 
-        site.docs_to_write.each do |document|
-          return document.url if document.relative_path == @relative_path
+        site.each_site_file do |item|
+          return item.url if item.relative_path == @relative_path
         end
 
         raise ArgumentError, <<eos
diff --git a/test/source/info.md b/test/source/info.md
new file mode 100644
index 00000000..a5539523
--- /dev/null
+++ b/test/source/info.md
@@ -0,0 +1,7 @@
+---
+title: Information
+---
+
+# Information
+
+Very important information is here
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 239a75fa..0ac0ae68 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -12,6 +12,7 @@ class TestTags < JekyllUnitTest
 
     site.posts.docs.concat(PostReader.new(site).read_posts("")) if override["read_posts"]
     CollectionReader.new(site).read if override["read_collections"]
+    site.read if override["read_all"]
 
     info = { :filters => [Jekyll::Filters], :registers => { :site => site } }
     @converter = site.converters.find { |c| c.class == converter_class }
@@ -627,6 +628,36 @@ CONTENT
     end
   end
 
+  context "simple page with linking to a page" do
+    setup do
+      content = <<CONTENT
+---
+title: linking
+---
+
+{% link contacts.html %}
+{% link info.md %}
+CONTENT
+      create_post(content, {
+        "source"           => source_dir,
+        "destination"      => dest_dir,
+        "read_all"         => true
+      })
+    end
+
+    should "not cause an error" do
+      refute_match(%r!markdown\-html\-error!, @result)
+    end
+
+    should "have the URL to the \"contacts\" item" do
+      assert_match(%r!/contacts\.html!, @result)
+    end
+
+    should "have the URL to the \"info\" item" do
+      assert_match(%r!/info\.html!, @result)
+    end
+  end
+
   context "simple page with linking" do
     setup do
       content = <<CONTENT