diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 6abd893d..21bfa4d6 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -243,7 +243,7 @@ module Jekyll
         def format_url(ssl_enabled, address, port, baseurl = nil)
           format("%<prefix>s://%<address>s:%<port>i%<baseurl>s",
                  :prefix  => ssl_enabled ? "https" : "http",
-                 :address => address,
+                 :address => address.include?(":") ? "[#{address}]" : address,
                  :port    => port,
                  :baseurl => baseurl ? "#{baseurl}/" : "")
         end
diff --git a/lib/jekyll/commands/serve/live_reload_reactor.rb b/lib/jekyll/commands/serve/live_reload_reactor.rb
index 78f9408f..30e88812 100644
--- a/lib/jekyll/commands/serve/live_reload_reactor.rb
+++ b/lib/jekyll/commands/serve/live_reload_reactor.rb
@@ -55,8 +55,9 @@ module Jekyll
               EM.schedule { @started_event.set }
               EM.add_shutdown_hook { @stopped_event.set }
 
+              host = opts["host"].include?(":") ? "[#{opts["host"]}]" : opts["host"]
               Jekyll.logger.info "LiveReload address:",
-                                 "http://#{opts["host"]}:#{opts["livereload_port"]}"
+                                 "http://#{host}:#{opts["livereload_port"]}"
             end
           end
           @thread.abort_on_exception = true