diff --git a/docs/changes.rst b/docs/changes.rst
index 0203a89f..f3b2a25d 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -68,6 +68,8 @@ backends:
 
 - The Spotify backend now includes release year and artist on albums.
 
+- Added support for search by filename to local backend.
+
 
 v0.8.1 (2012-10-30)
 ===================
diff --git a/mopidy/backends/local/library.py b/mopidy/backends/local/library.py
index 600bfaaa..09484ed0 100644
--- a/mopidy/backends/local/library.py
+++ b/mopidy/backends/local/library.py
@@ -59,7 +59,7 @@ class LocalLibraryProvider(base.BaseLibraryProvider):
                     result_tracks = filter(album_filter, result_tracks)
                 elif field == 'artist':
                     result_tracks = filter(artist_filter, result_tracks)
-                elif field == 'uri':
+                elif field in ('uri', 'filename'):
                     result_tracks = filter(uri_filter, result_tracks)
                 elif field == 'any':
                     result_tracks = filter(any_filter, result_tracks)
@@ -93,7 +93,7 @@ class LocalLibraryProvider(base.BaseLibraryProvider):
                     result_tracks = filter(album_filter, result_tracks)
                 elif field == 'artist':
                     result_tracks = filter(artist_filter, result_tracks)
-                elif field == 'uri':
+                elif field == 'uri' or field == 'filename':
                     result_tracks = filter(uri_filter, result_tracks)
                 elif field == 'any':
                     result_tracks = filter(any_filter, result_tracks)
diff --git a/tests/backends/base/library.py b/tests/backends/base/library.py
index cc2a0004..b7510dbb 100644
--- a/tests/backends/base/library.py
+++ b/tests/backends/base/library.py
@@ -79,6 +79,15 @@ class LibraryControllerTest(object):
         result = self.library.find_exact(album=['album2'])
         self.assertEqual(result, Playlist(tracks=self.tracks[1:2]))
 
+    def test_find_exact_filename(self):
+        track_1_filename = 'file://' + path_to_data_dir('uri1')
+        result = self.library.find_exact(filename=track_1_filename)
+        self.assertEqual(result, Playlist(tracks=self.tracks[:1]))
+
+        track_2_filename = 'file://' + path_to_data_dir('uri2')
+        result = self.library.find_exact(filename=track_2_filename)
+        self.assertEqual(result, Playlist(tracks=self.tracks[1:2]))
+
     def test_find_exact_wrong_type(self):
         test = lambda: self.library.find_exact(wrong=['test'])
         self.assertRaises(LookupError, test)
@@ -137,6 +146,13 @@ class LibraryControllerTest(object):
         result = self.library.search(uri=['RI2'])
         self.assertEqual(result, Playlist(tracks=self.tracks[1:2]))
 
+    def test_search_filename(self):
+        result = self.library.search(filename=['RI1'])
+        self.assertEqual(result, Playlist(tracks=self.tracks[:1]))
+
+        result = self.library.search(filename=['RI2'])
+        self.assertEqual(result, Playlist(tracks=self.tracks[1:2]))
+
     def test_search_any(self):
         result = self.library.search(any=['Tist1'])
         self.assertEqual(result, Playlist(tracks=self.tracks[:1]))