diff --git a/lib/jekyll/tags/link.rb b/lib/jekyll/tags/link.rb
index 6ffd4726..a076c417 100644
--- a/lib/jekyll/tags/link.rb
+++ b/lib/jekyll/tags/link.rb
@@ -16,8 +16,10 @@ 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
+          # This takes care of the case for static files that have a leading /
+          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_filters.rb b/test/test_filters.rb
index 1f4a3889..b5f0a395 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -475,7 +475,7 @@ class TestFilters < JekyllUnitTest
               g["items"].is_a?(Array),
               "The list of grouped items for '' is not an Array."
             )
-            assert_equal 13, g["items"].size
+            assert_equal 14, g["items"].size
           end
         end
       end
diff --git a/test/test_site.rb b/test/test_site.rb
index 57b06871..83d6e456 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -191,6 +191,7 @@ class TestSite < JekyllUnitTest
         humans.txt
         index.html
         index.html
+        info.md
         main.scss
         main.scss
         properties.html
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 239a75fa..16e10a9b 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,41 @@ CONTENT
     end
   end
 
+  context "simple page with linking to a page" do
+    setup do
+      content = <<CONTENT
+---
+title: linking
+---
+
+{% link contacts.html %}
+{% link info.md %}
+{% link /css/screen.css %}
+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
+
+    should "have the URL to the \"screen.css\" item" do
+      assert_match(%r!/css/screen\.css!, @result)
+    end
+  end
+
   context "simple page with linking" do
     setup do
       content = <<CONTENT