diff --git a/node/server.js b/node/server.js
index 2af04c82..8f83fe24 100644
--- a/node/server.js
+++ b/node/server.js
@@ -254,8 +254,8 @@ async.waterfall([
     });
     
     //let the server listen
-    app.listen(settings.port);
-    console.log("Server is listening at port " + settings.port);
+    app.listen(settings.port, settings.ip);
+    console.log("Server is listening at " + settings.ip + ":" + settings.port);
 
     //init socket.io and redirect all requests to the MessageHandler
     var io = socketio.listen(app);
diff --git a/node/utils/Settings.js b/node/utils/Settings.js
index eb820e8f..c66da70f 100644
--- a/node/utils/Settings.js
+++ b/node/utils/Settings.js
@@ -21,6 +21,11 @@
 
 var fs = require("fs");
 
+/**
+ * The IP ep-lite should listen to
+ */
+exports.ip = "0.0.0.0";
+  
 /**
  * The Port ep-lite should listen to
  */
diff --git a/settings.json.template b/settings.json.template
index 6b80021b..560bd26d 100644
--- a/settings.json.template
+++ b/settings.json.template
@@ -4,6 +4,8 @@
   Please edit settings.json, not settings.json.template
 */
 {
+  //Ip and port which etherpad should bind at
+  "ip": "0.0.0.0",
   "port" : 9001,
   
   //The Type of the database. You can choose between sqlite and mysql