diff --git a/src/cli.rs b/src/cli.rs
index 5708da45..eb59c5fd 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -58,13 +58,13 @@ pub fn build_cli() -> App<'static, 'static> {
                     Arg::with_name("interface")
                         .short("i")
                         .long("interface")
-                        .default_value("127.0.0.1")
-                        .help("Interface to bind on"),
+                        .takes_value(true)
+                        .help("Interface to bind on (default: 127.0.0.1)"),
                     Arg::with_name("port")
                         .short("p")
                         .long("port")
-                        .default_value("1111")
-                        .help("Which port to use"),
+                        .takes_value(true)
+                        .help("Which port to use (default: 1111)"),
                     Arg::with_name("output_dir")
                         .short("o")
                         .long("output-dir")
@@ -73,9 +73,8 @@ pub fn build_cli() -> App<'static, 'static> {
                     Arg::with_name("base_url")
                         .short("u")
                         .long("base-url")
-                        .default_value("127.0.0.1")
                         .takes_value(true)
-                        .help("Changes the base_url"),
+                        .help("Changes the base_url (default: 127.0.0.1)"),
                     Arg::with_name("drafts")
                         .long("drafts")
                         .takes_value(false)
diff --git a/src/main.rs b/src/main.rs
index 7bff8282..925d36d3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -54,7 +54,7 @@ fn main() {
         }
         ("serve", Some(matches)) => {
             let interface = matches.value_of("interface").unwrap_or("127.0.0.1");
-            let mut port: u16 = match matches.value_of("port").unwrap().parse() {
+            let mut port: u16 = match matches.value_of("port").unwrap_or("1111").parse() {
                 Ok(x) => x,
                 Err(_) => {
                     console::error("The request port needs to be an integer");
@@ -80,7 +80,7 @@ fn main() {
                 }
             }
             let output_dir = matches.value_of("output_dir").map(|output_dir| Path::new(output_dir));
-            let base_url = matches.value_of("base_url").unwrap();
+            let base_url = matches.value_of("base_url").unwrap_or("127.0.0.1");
             console::info("Building site...");
             match cmd::serve(
                 &root_dir,