diff --git a/404.md b/404.md
index e644c19ed2..3d32e81bcf 100644
--- a/404.md
+++ b/404.md
@@ -2,6 +2,7 @@
 layout: docwithnav
 title: 404 Error!
 permalink: /404.html
+no_canonical: true
 ---
 
 <script src="/js/redirects.js"></script>
diff --git a/robots.txt b/robots.txt
index 187d7c94bb..9bb39d8dbd 100644
--- a/robots.txt
+++ b/robots.txt
@@ -3,5 +3,7 @@ User-agent: *
 Disallow: /legacy/
 Disallow: /v1.0/
 Disallow: /v1.1/
+Disallow: /404/
+Disallow: 404.html
 
 SITEMAP: http://kubernetes.io/sitemap.xml
diff --git a/sitemap.xml b/sitemap.xml
index a965f4a570..ff1dd0d398 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -11,8 +11,8 @@
   <loc>http://kubernetes.io/</loc>
   <lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
 </url>
-{% for page in site.pages %}<url>
+{% for page in site.pages %}{% if page.url != "/404.html" and page.url != "/sitemap.xml" and page.url != "/css/styles.css" %}<url>
   <loc>http://kubernetes.io{{ page.url }}</loc>
   <lastmod>{% if page.date %}{{ page.date | date_to_xmlschema }}{% else %}{{ site.time | date_to_xmlschema }}{% endif %}</lastmod>
-</url>{% endfor %}
-</urlset>
\ No newline at end of file
+</url>{% endif %}{% endfor %}
+</urlset>