diff --git a/jupyterhub/app.py b/jupyterhub/app.py
index 9ea7be2f..8ce4f61c 100644
--- a/jupyterhub/app.py
+++ b/jupyterhub/app.py
@@ -262,7 +262,8 @@ class JupyterHubApp(Application):
             base_url=base_url,
             cookie_secret=self.cookie_secret,
             login_url=url_path_join(self.hub.server.base_url, 'login'),
-            template_path=os.path.join(here, 'templates'),
+            template_path=os.path.join(self.data_files_path, 'templates'),
+            static_files_path=os.path.join(self.data_files_path, 'static'),
         )
         # allow configured settings to have priority
         settings.update(self.tornado_settings)
diff --git a/jupyterhub/templates/login.html b/share/jupyter/templates/login.html
similarity index 100%
rename from jupyterhub/templates/login.html
rename to share/jupyter/templates/login.html