diff --git a/website/contact/index.html b/website/contact/index.html
index a289b291..b0abac48 100644
--- a/website/contact/index.html
+++ b/website/contact/index.html
@@ -42,6 +42,9 @@ li {
   <li>
     <a href="/screenshots/">Screenshots</a>
   </li>
+  <li>
+    <a href="/bugs">Bugtracker</a>
+  </li>
   <li>
     <strong><a href="/contact/">Contact</a></strong>
   </li>
diff --git a/website/docs/index.html b/website/docs/index.html
index cd141b89..a866a998 100644
--- a/website/docs/index.html
+++ b/website/docs/index.html
@@ -42,6 +42,9 @@ li {
   <li>
     <a href="/screenshots/">Screenshots</a>
   </li>
+  <li>
+    <a href="/bugs">Bugtracker</a>
+  </li>
   <li>
     <a href="/contact/">Contact</a>
   </li>
diff --git a/website/downloads/index.html b/website/downloads/index.html
index cce1cf2b..cb555c5c 100644
--- a/website/downloads/index.html
+++ b/website/downloads/index.html
@@ -42,6 +42,9 @@ li {
   <li>
     <a href="/screenshots/">Screenshots</a>
   </li>
+  <li>
+    <a href="/bugs">Bugtracker</a>
+  </li>
   <li>
     <a href="/contact/">Contact</a>
   </li>
diff --git a/website/index.html b/website/index.html
index 64d8d546..643cf5fc 100644
--- a/website/index.html
+++ b/website/index.html
@@ -42,6 +42,9 @@ li {
   <li>
     <a href="/screenshots/">Screenshots</a>
   </li>
+  <li>
+    <a href="/bugs">Bugtracker</a>
+  </li>
   <li>
     <a href="/contact/">Contact</a>
   </li>
diff --git a/website/robots.txt b/website/robots.txt
new file mode 100644
index 00000000..5d28f78d
--- /dev/null
+++ b/website/robots.txt
@@ -0,0 +1,2 @@
+User-Agent: *
+Disallow: /bugs/*
diff --git a/website/screenshots/index.html b/website/screenshots/index.html
index ec763f61..77ec57f5 100644
--- a/website/screenshots/index.html
+++ b/website/screenshots/index.html
@@ -42,6 +42,9 @@ li {
   <li>
     <strong><a href="/screenshots/">Screenshots</a></strong>
   </li>
+  <li>
+    <a href="/bugs">Bugtracker</a>
+  </li>
   <li>
     <a href="/contact/">Contact</a>
   </li>
@@ -58,7 +61,7 @@ li {
 
 <ul>
   <li>
-    <a href="/screenshots/i3-1.png">i3 v3.α</a>, Firefox with Vimperator-Plugin, VIM, MPlayer
+    <a href="/screenshots/i3-1.png">i3 v3.α</a>, Firefox with Vimperator-Plugin, VIM, MPlayer, dzen2
   </li>
 </ul>