diff --git a/templates/sitemap.xml b/templates/sitemap.xml
index 5a29cf8..869a1cd 100644
--- a/templates/sitemap.xml
+++ b/templates/sitemap.xml
@@ -1,8 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
-    xmlns:image="http://www.sitemaps.org/schemas/sitemap-image/1.1"
-    xmlns:video="http://www.sitemaps.org/schemas/sitemap-video/1.1">
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
     <url> 
-        <loc></loc> 
+        <loc>https://snipt.net/api/</loc> 
+        <changefreq>monthly</changefreq>
+        <priority>1.0</priority>
     </url>
+    <url> 
+        <loc>https://snipt.net/todo/</loc> 
+        <changefreq>daily</changefreq>
+        <priority>1.0</priority>
+    </url>
+    <url> 
+        <loc>https://snipt.net/public/</loc> 
+        <changefreq>always</changefreq>
+        <priority>1.0</priority>
+    </url>
+    <url> 
+        <loc>https://blog.snipt.net/</loc> 
+        <changefreq>weekly</changefreq>
+        <priority>1.0</priority>
+    </url>
+    {% for tag in tags %}
+        <url> 
+            <loc>https://snipt.net/public/tag/{{ tag.slug }}</loc> 
+            <priority>0.9</priority>
+        </url>
+    {% endfor %}
 </urlset>
diff --git a/views.py b/views.py
index 57d1f99..83d92ec 100644
--- a/views.py
+++ b/views.py
@@ -2,13 +2,21 @@ from django.shortcuts import render_to_response
 from annoying.decorators import ajax_request
 from django.template import RequestContext
 from snipts.utils import get_lexers_list
+from django.db.models import Count
+from taggit.models import Tag
 
 
 def sitemap(request):
+
+    tags = Tag.objects.filter(snipt__public=True)
+    tags = tags.annotate(count=Count('taggit_taggeditem_items__id'))
+    tags = tags.order_by('-count')[:20]
+    tags = sorted(tags, key=lambda tag: tag.name)
+
     return render_to_response('sitemap.xml',
-                              {},
-                              context_instance=RequestContext(request),
-                              mimetype='application/xml')
+                             {'tags': tags},
+                             context_instance=RequestContext(request),
+                             mimetype='application/xml')
 
 @ajax_request
 def lexers(request):