diff --git a/crates/ptth_server/src/lib.rs b/crates/ptth_server/src/lib.rs
index 0f2ae0b..c581bf6 100644
--- a/crates/ptth_server/src/lib.rs
+++ b/crates/ptth_server/src/lib.rs
@@ -73,7 +73,7 @@ async fn handle_one_req (
 	debug! ("Handling request {}", req_id);
 	
 	let default_root = PathBuf::from ("./");
-	let file_server_root: &std::path::Path = state.config.file_server_root
+	let file_server_root: &std::path::Path = state.config.file_server.file_server_root
 	.as_ref ()
 	.unwrap_or (&default_root);
 	
@@ -172,7 +172,7 @@ impl ConfigFile {
 #[derive (Default)]
 pub struct Config {
 	pub relay_url: String,
-	pub file_server_root: Option <PathBuf>,
+	pub file_server: file_server::Config,
 }
 
 pub async fn run_server (
@@ -210,7 +210,9 @@ pub async fn run_server (
 	let state = Arc::new (ServerState {
 		config: Config {
 			relay_url: config_file.relay_url,
-			file_server_root: config_file.file_server_root,
+			file_server: file_server::Config {
+				file_server_root: config_file.file_server_root,
+			},
 		},
 		handlebars,
 		instance_metrics,