diff --git a/CHANGELOG.md b/CHANGELOG.md
index da99501..aab2ba8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+
+## 0.4.0 (unreleased)
+
+- Fix `serve` not working with the config flag
+
 ## 0.3.4 (2018-06-22)
 
 - `cargo update` as some dependencies didn't compile with current Rust version
diff --git a/src/cmd/serve.rs b/src/cmd/serve.rs
index 67486d6..9a96459 100644
--- a/src/cmd/serve.rs
+++ b/src/cmd/serve.rs
@@ -115,8 +115,8 @@ pub fn serve(interface: &str, port: &str, output_dir: &str, base_url: &str, conf
         .chain_err(|| "Can't watch the `content` folder. Does it exist?")?;
     watcher.watch("templates/", RecursiveMode::Recursive)
         .chain_err(|| "Can't watch the `templates` folder. Does it exist?")?;
-    watcher.watch("config.toml", RecursiveMode::Recursive)
-        .chain_err(|| "Can't watch the `config.toml` file. Does it exist?")?;
+    watcher.watch(config_file, RecursiveMode::Recursive)
+        .chain_err(|| "Can't watch the `config` file. Does it exist?")?;
 
     if Path::new("static").exists() {
         watching_static = true;