diff --git a/ergonomadic.go b/ergonomadic.go
index 6537ff0b..41fe26b3 100644
--- a/ergonomadic.go
+++ b/ergonomadic.go
@@ -10,6 +10,7 @@ import (
 	_ "github.com/mattn/go-sqlite3"
 	"log"
 	"os"
+	"path/filepath"
 )
 
 func genPasswd(passwd string) {
@@ -57,6 +58,10 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
+	err = os.Chdir(filepath.Dir(*conf))
+	if err != nil {
+		log.Fatal(err)
+	}
 
 	if *initdb {
 		initDB(config)
diff --git a/irc/config.go b/irc/config.go
index 8fea2974..ba065722 100644
--- a/irc/config.go
+++ b/irc/config.go
@@ -5,7 +5,6 @@ import (
 	"encoding/base64"
 	"errors"
 	"log"
-	"path/filepath"
 )
 
 type PassConfig struct {
@@ -68,12 +67,5 @@ func LoadConfig(filename string) (config *Config, err error) {
 		err = errors.New("server.listen missing")
 		return
 	}
-
-	// make
-	dir := filepath.Dir(filename)
-	if config.Server.MOTD != "" {
-		config.Server.MOTD = filepath.Join(dir, config.Server.MOTD)
-	}
-	config.Server.Database = filepath.Join(dir, config.Server.Database)
 	return
 }