1 files changed, 3 insertions, 1 deletions
diff --git a/main.go b/main.go
index 857b88745..9bb5ccd80 100644
--- a/main.go
+++ b/main.go
@@ -64,7 +64,9 @@ func main() {
 
 	if *baseUrl != "" {
 		config.BaseUrl = *baseUrl
-	}
+	} else if *server {
+        config.BaseUrl = "http://localhost:" + *port
+    }
 
 	if *version {
 		fmt.Println("Hugo Static Site Generator v0.8")