diff --git a/CHANGELOG.md b/CHANGELOG.md
index c25cdb0f..ef6edfc3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Add back `draft` on pages that was wrongly removed
 - Page and Section `path` field is not starting with a `/` anymore
 - All Tera global fns are now rebuilt on changes
+- Use flags for port/interface in `gutenberg serve`
 
 ## 0.1.3 (2017-08-31)
 
diff --git a/src/cli.rs b/src/cli.rs
index c6f90914..75dd83da 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -17,8 +17,8 @@ pub fn build_cli() -> App<'static, 'static> {
         )
         (@subcommand serve =>
             (about: "Serve the site. Rebuild and reload on change automatically")
-            (@arg interface: "Interface to bind on (default to 127.0.0.1)")
-            (@arg port: "Which port to use (default to 1111)")
+            (@arg interface: -i --interface +takes_value "Interface to bind on (default to 127.0.0.1)")
+            (@arg port: -p --port +takes_value "Which port to use (default to 1111)")
         )
     )
 }