diff --git a/src/install.js b/src/install.js
index 4a4ef9351f..535e578379 100644
--- a/src/install.js
+++ b/src/install.js
@@ -18,7 +18,9 @@ var async = require('async'),
 		}, {
 			name: 'port',
 			description: 'Port number of your NodeBB',
-			'default': 4567
+			'default': 4567,
+            pattern: /[0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]/,
+            message: 'Please enter a value betweeen 1 and 65535'
 		}, {
 			name: 'use_port',
 			description: 'Use a port number to access NodeBB?',
@@ -40,7 +42,11 @@ var async = require('async'),
 		}, {
 			name: 'redis:password',
 			description: 'Password of your Redis database'
-		}],
+		}, {
+            name: 'bind_address',
+            description: 'IP or Hostname to bind to',
+            'default': '0.0.0.0'
+        }],
 		setup: function (callback) {
 			async.series([
 				function (next) {
diff --git a/src/meta.js b/src/meta.js
index f641e034af..cfc2a1d66d 100644
--- a/src/meta.js
+++ b/src/meta.js
@@ -162,7 +162,33 @@ var utils = require('./../public/src/utils.js'),
 			'src/ajaxify.js',
 			'src/translator.js',
 			'src/jquery.form.js',
-			'src/utils.js'
+			'src/utils.js',
+			'src/forum/account.js',
+			'src/forum/accountedit.js',
+			'src/forum/accountheader.js',
+			'src/forum/accountsettings.js',
+			'src/forum/category.js',
+			'src/forum/favourites.js',
+			'src/forum/followers.js',
+			'src/forum/following.js',
+			'src/forum/footer.js',
+			'src/forum/login.js',
+			'src/forum/recent.js',
+			'src/forum/register.js',
+			'src/forum/reset.js',
+			'src/forum/reset_code.js',
+			'src/forum/search.js',
+			'src/forum/topic.js',
+			'src/forum/unread.js',
+			'src/forum/users.js',
+			'src/forum/admin/categories.js',
+			'src/forum/admin/footer.js',
+			'src/forum/admin/groups.js',
+			'src/forum/admin/index.js',
+			'src/forum/admin/plugins.js',
+			'src/forum/admin/themes.js',
+			'src/forum/admin/topics.js',
+			'src/forum/admin/users'
 		],
 		minFile: path.join(__dirname, '..', 'public/src/nodebb.min.js'),
 		get: function (callback) {
diff --git a/src/webserver.js b/src/webserver.js
index a9b7488f90..0b07f23f43 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -185,7 +185,7 @@ var express = require('express'),
 			templates['logout'] = parsedTemplate;
 		});
 
-		server.listen(nconf.get('PORT') || nconf.get('port'));
+		server.listen(nconf.get('PORT') || nconf.get('port'), nconf.get('bind_address'));
 	}
 
 	app.create_route = function (url, tpl) { // to remove