diff --git a/src/genpage.nim b/src/genpage.nim
index f2edb74..b65f1ce 100644
--- a/src/genpage.nim
+++ b/src/genpage.nim
@@ -1,5 +1,5 @@
 import httpclient
-import os, strutils, strformat, tables, re, sugar, uri
+import os, strutils, strformat, tables, re, sugar, uri, times
 
 type
   Urls = seq[string]
@@ -120,7 +120,8 @@ proc compilePage(content: string, video_uri: string = "", search_query: string =
   return page
 
 proc compileRSSPage(content: string, search_query: string = ""): string =
-  var rss = RESOURCES["rss_start"]
+  var rss = RESOURCES["rss_start"].replace("Pimvidious",fmt"Pimvidious {search_query}")
+  rss = rss.replace("BUILDDATE", now().format("YYYY-MM-dd'T'HH:mm:ss"))
   let urls = parseUrls(content)
   let thumbs = parseThumbs(content)
   for idx, url in urls:
@@ -133,7 +134,15 @@ proc compileRSSPage(content: string, search_query: string = ""): string =
       vid_url = url.replace("THUMBNUM","1")
       vid_thumb = thumbs[^1].replace("THUMBNUM","1")
     let title = vid_url.split("/")[^1].replace("_"," ")
-    rss &= fmt"""<item><title>{title}</titcle><link>{vid_url}</link><description>{title}</description><image><title>{title}</title><url>{vid_thumb}</url></image></item>"""
+    rss &= fmt"""
+      <item>
+        <guid isPermaLink="true">{url}</guid>
+        <title>{title}</title>
+        <link>{vid_url}</link>
+        <description>{title}</description>
+        <media:content url="{vid_thumb}" type="image/png"></media:content>
+      </item>
+    """
   rss &= RESOURCES["rss_end"]
   return rss
 
diff --git a/src/resources/rss_start b/src/resources/rss_start
index 64b0b2b..411dc93 100644
--- a/src/resources/rss_start
+++ b/src/resources/rss_start
@@ -1,4 +1,7 @@
-<rss version="2.0">
-<channel>
-<title>Pimvidious</title>
-<link>https://example.com</link>
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:webfeeds="http://webfeeds.org/rss/1.0" xmlns:media="http://search.yahoo.com/mrss/">
+  <channel>
+    <title>Pimvidious</title>
+    <link>BASEURL</link>
+    <lastBuildDate>BUILDDATE</lastBuildDate>
+    <generator>Pimvidious</generator>