diff --git a/erisdb/serve.go b/erisdb/serve.go
index 2ba2581308ec522f07703c80a10f3338f72f1210..bfd63b1b38073284905177f62613fc076d8e2141 100644
--- a/erisdb/serve.go
+++ b/erisdb/serve.go
@@ -67,7 +67,7 @@ func ServeErisDB(workDir string, inProc bool) (*server.ServeProcess, error) {
 
 	// Get an erisdb configuration
 	var edbConf *edbcfg.ErisDBConfig
-	edbConfPath := path.Join(workDir, "config.toml")
+	edbConfPath := path.Join(workDir, "server_config.toml")
 	if !FileExists(edbConfPath) {
 		log.Info("No server configuration, using default.")
 		log.Info("Writing to: " + edbConfPath)