diff --git a/default.nix b/default.nix
index fcf12b80479..d4638506543 100644
--- a/default.nix
+++ b/default.nix
@@ -17,6 +17,7 @@ in
     grubMenuBuilder
     initialRamdisk
     kernel
+    modulesTree
     nix
     system
     systemPath
diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index 08ed6ce93e7..3d28d4850ae 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -230,12 +230,10 @@ let
   };
 
   staticFilesConfig = ''
-    # !!! this breaks UserDir if urlPrefix == ""
-    Alias ${if urlPrefix == "" then "/" else urlPrefix} ${staticFiles}/
+    Alias ${urlPrefix}/svn-files ${staticFiles}/
     <Directory ${staticFiles}>
         Order allow,deny
         Allow from all
-        DirectoryIndex repoman
     </Directory>
   '';
 
@@ -291,7 +289,7 @@ in {
     
     <Location ${urlPrefix}/repos-xml>
       ${reposConfig "repos-xml"}
-      SVNIndexXSLT "${urlPrefix}/xsl/svnindex.xsl"
+      SVNIndexXSLT "${urlPrefix}/svn-files/xsl/svnindex.xsl"
     </Location>
 
     ${viewvcConfig}