diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61f381d9..8d7c408f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ 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]