diff --git a/404.md b/404.md
index 1d751e3..e02f5c5 100644
--- a/404.md
+++ b/404.md
@@ -2,6 +2,7 @@
 title: Page Not Found
 layout: article
 permalink: 404.html
+sitemap: false
 ---
 
 
diff --git a/_config.yml b/_config.yml
index 659371e..7570d86 100644
--- a/_config.yml
+++ b/_config.yml
@@ -6,7 +6,6 @@ sass:
 
 plugins:
   - jekyll-redirect-from
-  - jekyll-sitemap
 
 exclude:
   - locale
diff --git a/feedback/thanks.md b/feedback/thanks.md
index 7b44715..5ba9355 100644
--- a/feedback/thanks.md
+++ b/feedback/thanks.md
@@ -1,6 +1,7 @@
 ---
 title: Thanks for the feedback
 layout: article
+sitemap: false
 ---
 
 # Thanks for the feedback
diff --git a/sitemap.xml b/sitemap.xml
new file mode 100644
index 0000000..89ba4be
--- /dev/null
+++ b/sitemap.xml
@@ -0,0 +1,28 @@
+---
+---
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+		xmlns:xhtml="http://www.w3.org/1999/xhtml">
+
+{% for page in site.pages %}
+	{% assign pathsplit = page.path | split: '/' %}
+	{% assign lang = pathsplit[0] %}
+	{% unless page.sitemap == false or page.layout == null %}
+	<url>
+		<loc>{{ page.url | absolute_url }}</loc>
+
+		{% if site.data.locale[lang] %}
+			{% assign oldSegment = "/" | append: lang | append: "/" %}
+			{% for other in site.data.languages %}
+				{% assign newSegment = "/" | append: other.code | append: "/" %}
+				<xhtml:link
+					rel="alternate"
+					hreflang="{{ other.code }}"
+					href="{{ page.url | replace: oldSegment, newSegment | absolute_url }}"/>
+			{% endfor %}
+		{% endif %}
+	</url>
+	{% endunless %}
+{% endfor %}
+
+</urlset>
diff --git a/uninstall.html b/uninstall.html
index c43e90e..a7fada6 100644
--- a/uninstall.html
+++ b/uninstall.html
@@ -1,5 +1,6 @@
 ---
 title: Uninstall Feedback
+sitemap: false
 layout: article
 reasons:
   missing_features: