diff --git a/404.md b/404.md
index 4e444428..b55044b8 100644
--- a/404.md
+++ b/404.md
@@ -6,6 +6,7 @@ image:
   feature: texture-feature-01.jpg
   credit: Texture Lovers
   creditlink: http://texturelovers.com
+sitemap: false
 ---  
 
 Sorry, but the page you were trying to view does not exist --- perhaps you can try searching for it below.
diff --git a/_config.yml b/_config.yml
index 16d2631a..8219618f 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,6 +11,8 @@ url:              http://localhost:4000
 permalink:   /:categories/:title/
 markdown:    kramdown
 highlighter: pygments
+gems:
+  - jekyll-sitemap
 
 kramdown:
   auto_ids: true
diff --git a/feed.xml b/feed.xml
index 00a1218a..1987c2c3 100644
--- a/feed.xml
+++ b/feed.xml
@@ -1,5 +1,6 @@
 ---
 layout: none
+sitemap: false
 ---
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
diff --git a/sitemap.xml b/sitemap.xml
deleted file mode 100644
index 604cb0d5..00000000
--- a/sitemap.xml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-layout: nil
----
-<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-    <url>
-        <loc>{{ site.url }}</loc>
-    </url>
-    
-    {% for page in site.pages %}
-    <url>
-        <loc>{{ site.url }}{{ page.url }}</loc>
-    </url>
-    {% endfor %}
-
-    {% for post in site.posts %}
-    <url>
-        <loc>{{ site.url }}{{ post.url }}</loc>
-    </url>
-    {% endfor %}
-</urlset>
\ No newline at end of file