diff --git a/public/src/utils.js b/public/src/utils.js
index c99fbb99a3..223c8a745c 100644
--- a/public/src/utils.js
+++ b/public/src/utils.js
@@ -129,6 +129,23 @@
 			return tags;
 		},
 
+		buildLinkTags: function(tagsArr) {
+			var tags = '',
+				tag;
+			for (var x = 0, numTags = tagsArr.length; x < numTags; x++) {
+				if (tags.length > 0) tags += "\n\t";
+				tag = '<link';
+				for (y in tagsArr[x]) {
+					tag += ' ' + y + '="' + tagsArr[x][y] + '"';
+				}
+				tag += ' />';
+
+				tags += tag;
+			}
+
+			return tags;
+		},
+
 		refreshTitle: function(url) {
 			if (!url) {
 				var a = document.createElement('a');
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 24584b68c8..8e18456a58 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -5,6 +5,7 @@
 	{meta_tags}
 	<link href="{cssSrc}" rel="stylesheet" media="screen">
 	<link rel="stylesheet" href="{relative_path}/vendor/fontawesome/css/font-awesome.min.css">
+	{link_tags}
 	<!-- BEGIN pluginCSS -->
 	<link rel="stylesheet" href="{pluginCSS.path}">
 	<!-- END pluginCSS -->
diff --git a/src/webserver.js b/src/webserver.js
index 850bbfae30..ce6fe20e5d 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -53,22 +53,23 @@ var express = require('express'),
 
 		plugins.fireHook('filter:header.build', custom_header, function(err, custom_header) {
 			var defaultMetaTags = [{
-				name: 'viewport',
-				content: 'width=device-width, initial-scale=1.0, user-scalable=no'
-			}, {
-				name: 'content-type',
-				content: 'text/html; charset=UTF-8'
-			}, {
-				name: 'apple-mobile-web-app-capable',
-				content: 'yes'
-			}, {
-				property: 'og:site_name',
-				content: meta.config.title || 'NodeBB'
-			}, {
-				property: 'keywords',
-				content: meta.config['keywords'] || ''
-			}],
+					name: 'viewport',
+					content: 'width=device-width, initial-scale=1.0, user-scalable=no'
+				}, {
+					name: 'content-type',
+					content: 'text/html; charset=UTF-8'
+				}, {
+					name: 'apple-mobile-web-app-capable',
+					content: 'yes'
+				}, {
+					property: 'og:site_name',
+					content: meta.config.title || 'NodeBB'
+				}, {
+					property: 'keywords',
+					content: meta.config['keywords'] || ''
+				}],
 				metaString = utils.buildMetaTags(defaultMetaTags.concat(options.metaTags || [])),
+				linkTags = utils.buildLinkTags(options.linkTags || []),
 				templateValues = {
 					cssSrc: meta.config['theme:src'] || nconf.get('relative_path') + '/vendor/bootstrap/css/bootstrap.min.css',
 					pluginCSS: plugins.cssFiles.map(function(file) { return { path: file } }),
@@ -79,6 +80,7 @@ var express = require('express'),
 					csrf: options.res.locals.csrf_token,
 					relative_path: nconf.get('relative_path'),
 					meta_tags: metaString,
+					link_tags: linkTags,
 					clientScripts: clientScripts,
 					navigation: custom_header.navigation
 				};
@@ -427,7 +429,18 @@ var express = require('express'),
 						}, {
 							property: 'article:section',
 							content: topicData.category_name
-						}]
+						}],
+						linkTags: [
+							{
+								rel: 'alternate',
+								type: 'application/rss+xml',
+								href: nconf.get('url') + 'topic/' + tid + '.rss'
+							},
+							{
+								rel: 'up',
+								href: nconf.get('url') + 'category/' + topicData.category_slug
+							}
+						]
 					}, function (err, header) {
 						next(err, {
 							header: header,
@@ -496,7 +509,18 @@ var express = require('express'),
 						}, {
 							property: "og:type",
 							content: 'website'
-						}]
+						}],
+						linkTags: [
+							{
+								rel: 'alternate',
+								type: 'application/rss+xml',
+								href: nconf.get('url') + 'category/' + cid + '.rss'
+							},
+							{
+								rel: 'up',
+								href: nconf.get('url')
+							}
+						]
 					}, function (err, header) {
 						next(err, {
 							header: header,