diff --git a/public/templates/admin/settings.tpl b/public/templates/admin/settings.tpl
index ecc51cd730..b01713c9a6 100644
--- a/public/templates/admin/settings.tpl
+++ b/public/templates/admin/settings.tpl
@@ -8,6 +8,8 @@
 		<input class="form-control" type="text" placeholder="Your Community Name" data-field="title" /><br />
 		<label>Site Description</label>
 		<input type="text" class="form-control" placeholder="A short description about your community" data-field="description" /><br />
+		<label>Site Keywords</label>
+		<input type="text" class="form-control" placeholder="Keywords describing your community, comma-seperated" data-field="keywords" /><br />
 		<label>Imgur Client ID</label>
 		<input type="text" class="form-control" placeholder="Imgur ClientID for image uploads" data-field="imgurClientID" /><br />
 		<label>Maximum User Image Size</label>
diff --git a/src/install.js b/src/install.js
index 535e578379..84eb798f2c 100644
--- a/src/install.js
+++ b/src/install.js
@@ -43,10 +43,10 @@ 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'
-        }],
+			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/webserver.js b/src/webserver.js
index a134a4ac58..5d76dc3fce 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -56,6 +56,9 @@ var express = require('express'),
 		}, {
 			property: 'og:site_name',
 			content: meta.config.title || 'NodeBB'
+		}, {
+			property: 'keywords',
+			content: meta.config['keywords'] || ''
 		}],
 			metaString = utils.buildMetaTags(defaultMetaTags.concat(options.metaTags || [])),
 			templateValues = {