diff --git a/docs/changes.rst b/docs/changes.rst
index 296e7e38..d5245e71 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -5,6 +5,14 @@ Changes
 This change log is used to track all major changes to Mopidy.
 
 
+v0.11.2 (UNRELEASED)
+====================
+
+**Local backend**
+
+- Make ``mopidy-scan`` support symlinks.
+
+
 v0.11.1 (2012-12-24)
 ====================
 
diff --git a/mopidy/utils/path.py b/mopidy/utils/path.py
index c4fa0ce2..7d988a90 100644
--- a/mopidy/utils/path.py
+++ b/mopidy/utils/path.py
@@ -120,7 +120,7 @@ def find_files(path):
         if not os.path.basename(path).startswith(b'.'):
             yield path
     else:
-        for dirpath, dirnames, filenames in os.walk(path):
+        for dirpath, dirnames, filenames in os.walk(path, followlinks=True):
             for dirname in dirnames:
                 if dirname.startswith(b'.'):
                     # Skip hidden folders by modifying dirnames inplace