diff --git a/mopidy/frontends/http/actor.py b/mopidy/frontends/http/actor.py
index 181eb93c..b0697409 100644
--- a/mopidy/frontends/http/actor.py
+++ b/mopidy/frontends/http/actor.py
@@ -50,7 +50,7 @@ class HttpFrontend(pykka.ThreadingActor, CoreListener):
         if settings.HTTP_SERVER_STATIC_DIR:
             static_dir = settings.HTTP_SERVER_STATIC_DIR
         else:
-            static_dir = os.path.dirname(__file__)
+            static_dir = os.path.join(os.path.dirname(__file__), 'data')
         logger.debug('HTTP server will serve "%s" at /', static_dir)
 
         config = {
diff --git a/mopidy/frontends/http/index.html b/mopidy/frontends/http/data/index.html
similarity index 100%
rename from mopidy/frontends/http/index.html
rename to mopidy/frontends/http/data/index.html