diff --git a/cluster.js b/cluster.js
index 6ccfdc43..94f2e55d 100755
--- a/cluster.js
+++ b/cluster.js
@@ -38,7 +38,7 @@ cluster(ws)
   .use(cluster.stats())
   .use(cluster.pidfiles('pids'))
   .set('workers', 1)
-  .listen(global.environment.windshaft_port);
+  .listen(global.environment.windshaft_port, global.environment.windshaft_host);
 
 //ws.listen(global.environment.windshaft_port);
 console.log("Windshaft tileserver started on port " + global.environment.windshaft_port);
diff --git a/config/environments/development.js b/config/environments/development.js
index ac64bcd0..1522e4fa 100644
--- a/config/environments/development.js
+++ b/config/environments/development.js
@@ -15,6 +15,7 @@ module.exports.redis            = {host: '127.0.0.1',
                                    idleTimeoutMillis: 1,
                                    reapIntervalMillis: 1};
 module.exports.windshaft_port   = 8181;
+module.exports.windshaft_host   = '127.0.0.1';
 module.exports.enable_cors      = true;
 module.exports.varnish_host     = 'localhost';
 module.exports.varnish_port     = 6082;
diff --git a/config/environments/production.js b/config/environments/production.js
index f56a99e3..3912b1a7 100644
--- a/config/environments/production.js
+++ b/config/environments/production.js
@@ -2,6 +2,7 @@ module.exports.name             = 'production';
 module.exports.postgres         = {user: 'tileuser', host: '127.0.0.1', port: 6432, simplify: true};
 module.exports.redis            = {host: '127.0.0.1', port: 6379};
 module.exports.windshaft_port   = 8181;
+module.exports.windshaft_host   = '127.0.0.1';
 module.exports.ttl_timeout = 600; // 10 minutes
 module.exports.varnish_host = 'localhost';
 module.exports.varnish_port = 6082
diff --git a/config/environments/test.js b/config/environments/test.js
index 381fda85..e137d5d5 100644
--- a/config/environments/test.js
+++ b/config/environments/test.js
@@ -5,6 +5,7 @@ module.exports.redis            = {host: '127.0.0.1',
                                    idleTimeoutMillis: 1,
                                    reapIntervalMillis: 1};
 module.exports.windshaft_port   = 8080;
+module.exports.windshaft_host   = '127.0.0.1';
 module.exports.enable_cors = true;
 module.exports.varnish_host = '';
 module.exports.varnish_port = null;