diff --git a/router/router.go b/router/router.go
index c6422e8e..bbcbe490 100644
--- a/router/router.go
+++ b/router/router.go
@@ -26,6 +26,6 @@ func init()  {
 	Router.HandleFunc("/api/{page}", ApiHandler).Methods("GET")
 	Router.HandleFunc("/api/view/{id}", ApiViewHandler).Methods("GET")
 	Router.HandleFunc("/faq", FaqHandler).Name("faq")
-	Router.HandleFunc("/feed.xml", RssHandler)
+	Router.HandleFunc("/feed.xml", RssHandler).Name("feed")
 	Router.HandleFunc("/view/{id}", ViewHandler).Name("view_torrent")
 }
\ No newline at end of file
diff --git a/router/templateFunctions.go b/router/templateFunctions.go
index 1b8618a7..a2fad90f 100644
--- a/router/templateFunctions.go
+++ b/router/templateFunctions.go
@@ -17,6 +17,13 @@ var FuncMap = template.FuncMap{
 		}
 		return "error"
 	},
+	"genRouteWithQuery": func(name string, currentUrl *url.URL, params ...string) template.HTML {
+		url, err := Router.Get(name).URL(params...)
+		if err == nil {
+			return template.HTML(url.String()+ "?" + currentUrl.RawQuery)
+		}
+		return "error"
+	},
 	"genNav": func(nav Navigation, currentUrl *url.URL, pagesSelectable int) template.HTML {
 		maxPages := math.Ceil(float64(nav.TotalItem) / float64(nav.MaxItemPerPage))
 
diff --git a/templates/index.html b/templates/index.html
index f5bc84e7..21de1d34 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7,6 +7,10 @@
     <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
     <title>Nyaa Pantsu - {{block "title" .}}Error 404{{end}}</title>
     <link rel="icon" type="image/png" href="/img/favicon.png" />
+
+    <!-- RSS Feed with Context -->
+    <link href="{{ genRouteWithQuery "feed" .URL }}" rel="alternate" type="application/rss+xml" title="Nyaa Pantsu - {{block "rsstitle" .}}Last torrents{{end}} RSS Feed" />
+
     <!-- Latest compiled and minified CSS -->
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
 
@@ -39,6 +43,7 @@
                       <li><a href="https://sukebei.pantsu.cat">Fap</a></li>
                       <li><a href="{{.URL.Parse "/faq"}}">FAQ</a></li>
                       <li><a href="irc://irc.rizon.net/nyaapantsu">IRC</a></li>
+                      <li><a href="{{ genRouteWithQuery "feed" .URL }}">Feed RSS</a></li>
                   </ul>
                   <form class="navbar-form navbar-right" role="search" action="/search" method="get">
                       <div class="form-group">