diff --git a/src/Symfony/Bundle/WebServerBundle/CHANGELOG.md b/src/Symfony/Bundle/WebServerBundle/CHANGELOG.md
index 5fb759ca9729b..af709a0ee45e3 100644
--- a/src/Symfony/Bundle/WebServerBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/WebServerBundle/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+3.4.0
+-----
+
+ * WebServer can now use '*' as a wildcard to bind to 0.0.0.0 (INADDR_ANY)
+
 3.3.0
 -----
 
diff --git a/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php b/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
index 88ed375dd15e8..6c17d110feb01 100644
--- a/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
+++ b/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
@@ -54,6 +54,9 @@ public function __construct($documentRoot, $env, $address = null, $router = null
             $this->port = $this->findBestPort();
         } elseif (false !== $pos = strrpos($address, ':')) {
             $this->hostname = substr($address, 0, $pos);
+            if ('*' === $this->hostname) {
+                $this->hostname = '0.0.0.0';
+            }
             $this->port = substr($address, $pos + 1);
         } elseif (ctype_digit($address)) {
             $this->hostname = '127.0.0.1';