diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index 1158c044..f26263e3 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -97,7 +97,8 @@ module Jekyll
 
     def to_liquid
       {
-        "name"          => File.basename(name, extname),
+        "basename"      => File.basename(name, extname),
+        "name"          => name,
         "extname"       => extname,
         "modified_time" => modified_time,
         "path"          => File.join("", relative_path)
diff --git a/site/_docs/static_files.md b/site/_docs/static_files.md
index df12acf1..19d45089 100644
--- a/site/_docs/static_files.md
+++ b/site/_docs/static_files.md
@@ -42,7 +42,15 @@ following metadata:
       <td><p><code>file.name</code></p></td>
       <td><p>
 
-        The string name of the file without the extension, e.g. <code>image</code> for <code>image.jpg</code>
+        The string name of the file e.g. <code>image.jpg</code> for <code>image.jpg</code>
+
+      </p></td>
+    </tr>
+    <tr>
+      <td><p><code>file.basename</code></p></td>
+      <td><p>
+
+        The string basename of the file e.g. <code>image</code> for <code>image.jpg</code>
 
       </p></td>
     </tr>
diff --git a/test/test_static_file.rb b/test/test_static_file.rb
index a53dc952..ebb51c23 100644
--- a/test/test_static_file.rb
+++ b/test/test_static_file.rb
@@ -134,7 +134,8 @@ class TestStaticFile < JekyllUnitTest
 
     should "be able to convert to liquid" do
       expected = {
-        "name"          => "static_file",
+        "basename"      => "static_file",
+        "name"          => "static_file.txt",
         "extname"       => ".txt",
         "modified_time" => @static_file.modified_time,
         "path"          => "/static_file.txt"