diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index d7e902b5c..cb69e00f8 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -17,5 +17,11 @@ class StaticController < ApplicationController
 
   def site_map
   end
-  
+
+  def sitemap
+    @popular_search_service = PopularSearchService.new(Date.today)
+    @post_set = PostSets::Popular.new(Date.today.to_s, "week", limit: 100)
+    @posts = @post_set.posts
+    render layout: false
+  end  
 end
diff --git a/app/logical/post_sets/popular.rb b/app/logical/post_sets/popular.rb
index f5f2df4f8..6e7a0c427 100644
--- a/app/logical/post_sets/popular.rb
+++ b/app/logical/post_sets/popular.rb
@@ -1,10 +1,11 @@
 module PostSets
   class Popular < PostSets::Base
-    attr_reader :date, :scale
+    attr_reader :date, :scale, :limit
 
-    def initialize(date, scale)
+    def initialize(date, scale, limit: nil)
       @date = date.blank? ? Time.zone.now : Time.zone.parse(date)
       @scale = scale
+      @limit = limit || CurrentUser.per_page
     end
 
     def posts
@@ -15,10 +16,6 @@ module PostSets
       end
     end
 
-    def limit
-       CurrentUser.user.per_page
-    end
-
     def min_date
       case scale
       when "week"
diff --git a/app/views/static/sitemap.xml.erb b/app/views/static/sitemap.xml.erb
new file mode 100644
index 000000000..79dfe190b
--- /dev/null
+++ b/app/views/static/sitemap.xml.erb
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+   xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
+   <url>
+      <loc><%= posts_url %></loc>
+      <changefreq>daily</changefreq>
+   </url>
+   <url>
+      <loc><%= wiki_pages_url %></loc>
+      <changefreq>daily</changefreq>
+   </url>
+   <url>
+      <loc><%= pools_url %></loc>
+      <changefreq>daily</changefreq>
+   </url>
+
+   <%# cache("sitemap", :expires_in => 24.hours) do %>
+      <% @popular_search_service.each_search do |tags, count| %>
+         <url>
+            <loc><%= posts_url(tags: tags) %></loc>
+            <lastmod><%= Date.today %></lastmod>
+         </url>
+      <% end %>
+
+      <% @posts.each do |post| %>
+         <url>
+            <loc><%= post_url(post) %></loc>
+            <image:image>
+               <image:loc>
+                  <%= post.file_url %>
+               </image:loc>
+               <image:caption>
+                  <%= post.presenter.humanized_essential_tag_string %>
+               </image:caption>
+            </image:image>
+            <lastmod><%= post.created_at.to_date %></lastmod>
+         </url>
+      <% end %>
+   <%# end %>
+</urlset>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 0821ed676..ad3bbea85 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -421,6 +421,7 @@ Rails.application.routes.draw do
   get "/wiki/recent_changes" => redirect {|params, req| "/wiki_page_versions?search[updater_id]=#{req.params[:user_id]}"}
   get "/wiki/history/:title" => redirect("/wiki_page_versions?title=%{title}")
 
+  get "/sitemap" => "static#sitemap"
   get "/static/keyboard_shortcuts" => "static#keyboard_shortcuts", :as => "keyboard_shortcuts"
   get "/static/bookmarklet" => "static#bookmarklet", :as => "bookmarklet"
   get "/static/site_map" => "static#site_map", :as => "site_map"
diff --git a/public/sitemap.xml b/public/sitemap.xml
deleted file mode 100644
index 3ec56a3ba..000000000
--- a/public/sitemap.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-   <url>
-      <loc>http://danbooru.donmai.us/posts</loc>
-      <changefreq>hourly</changefreq>
-      <priority>1.0</priority>
-   </url>
-   <url>
-      <loc>http://danbooru.donmai.us/posts?tags=kantai_collection</loc>
-      <changefreq>hourly</changefreq>
-      <priority>0.7</priority>
-   </url>
-   <url>
-      <loc>http://danbooru.donmai.us/posts?tags=touhou</loc>
-      <changefreq>hourly</changefreq>
-      <priority>0.7</priority>
-   </url>
-   <url>
-      <loc>http://danbooru.donmai.us/posts?tags=kemono_friends</loc>
-      <changefreq>daily</changefreq>
-      <priority>0.3</priority>
-   </url>
-   <url>
-      <loc>http://danbooru.donmai.us/posts?tags=fate%2fgrand_order</loc>
-      <changefreq>daily</changefreq>
-      <priority>0.3</priority>
-   </url>
-   <url>
-      <loc>http://danbooru.donmai.us/posts?tags=pokemon</loc>
-      <changefreq>daily</changefreq>
-      <priority>0.3</priority>
-   </url>
-   <url>
-      <loc>http://danbooru.donmai.us/posts?tags=overwatch</loc>
-      <changefreq>daily</changefreq>
-      <priority>0.3</priority>
-   </url>
-   <url>
-      <loc>http://danbooru.donmai.us/wiki_pages</loc>
-      <changefreq>daily</changefreq>
-      <priority>0.3</priority>
-   </url>
-   <url>
-      <loc>http://danbooru.donmai.us/pools</loc>
-      <changefreq>daily</changefreq>
-      <priority>0.5</priority>
-   </url>
-</urlset> 
\ No newline at end of file