diff --git a/CHANGELOG.md b/CHANGELOG.md
index d10c5e35..8d7c408f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@ master
 ===
 
 * The preview server can now serve over HTTPS using the `--https` flag. It will use an automatic self-signed cert which can be overridden using `--ssl_certificate` and `--ssl_private_key`. These settings can also be set in `config.rb`
+* The preview server URL will use 'localhost' rather than '0.0.0.0'.
+* The preview server URL will once again use the machine's hostname if available.
 
 3.3.11
 ===
diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index 3173b139..f508f171 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -1,3 +1,5 @@
+require 'socket'
+
 # Using Tilt for templating
 require 'tilt'
 
@@ -69,7 +71,7 @@ module Middleman
 
     # Which host preview should start on.
     # @return [Fixnum]
-    config.define_setting :host, '0.0.0.0', 'The preview server host'
+    config.define_setting :host, Socket.gethostname, 'The preview server host'
 
     # Which port preview should start on.
     # @return [Fixnum]
diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb
index 42730788..7a4c1282 100644
--- a/middleman-core/lib/middleman-core/preview_server.rb
+++ b/middleman-core/lib/middleman-core/preview_server.rb
@@ -21,9 +21,8 @@ module Middleman
         @options = opts
 
         mount_instance(new_app)
-        scheme = https? ? 'https' : 'http'
-        logger.info "== The Middleman is standing watch at #{scheme}://#{host}:#{port}"
-        logger.info "== Inspect your site configuration at #{scheme}://#{host}:#{port}/__middleman/"
+        logger.info "== The Middleman is standing watch at #{uri}"
+        logger.info "== Inspect your site configuration at #{uri + '__middleman'}"
 
         @initialized ||= false
         return if @initialized
@@ -264,6 +263,15 @@ module Middleman
           end
         end
       end
+
+      # Returns the URI the preview server will run on
+      # @return [URI]
+      def uri
+        host = @host == '0.0.0.0' ? 'localhost' : @host
+        scheme = https? ? 'https' : 'http'
+        URI("#{scheme}://#{host}:#{@port}")
+      end
+
     end
 
     class FilteredWebrickLog < ::WEBrick::Log