diff --git a/README.md b/README.md
index 21cb585a..abf40ef1 100644
--- a/README.md
+++ b/README.md
@@ -136,7 +136,7 @@ to each other.
  * [Troubleshooting](http://docs.weave.works/weave/latest_release/troubleshooting.html)
  * [Building](http://docs.weave.works/weave/latest_release/building.html)
  * [How it works](http://docs.weave.works/weave/latest_release/how-it-works.html)
- * [Automatic Discovery with WeaveDNS](https://github.com/weaveworks/weave/tree/latest_release/weavedns#readme)
+ * [Automatic Discovery with WeaveDNS](http://docs.weave.works/weave/latest_release/weavedns-readme.html)
 
 ## Contact Us
 
diff --git a/site/index.md b/site/index.md
index 544f341d..bcf85121 100644
--- a/site/index.md
+++ b/site/index.md
@@ -5,12 +5,11 @@ layout: default
 
 # weave documentation
 
- * [Introduction and example (in README)](https://github.com/weaveworks/weave#readme)
+ * [Introduction, Installation and Example](https://github.com/weaveworks/weave#readme)
+ * [Getting Started Guides](http://weave.works/guides/)
  * [Features](features.html)
+ * [Automatic Discovery with WeaveDNS](weavedns-readme.html)
  * [Troubleshooting](troubleshooting.html)
  * [Building](building.html)
  * [How it works](how-it-works.html)
  * [Contact information](https://github.com/weaveworks/weave#contact-us)
- * *Installation Notes*
-   * [Using with boot2docker](boot2docker.html)
-   * [Using with systemd](systemd.html)
diff --git a/weavedns/design.md b/site/weavedns-design.md
similarity index 98%
rename from weavedns/design.md
rename to site/weavedns-design.md
index 67c44214..5c09afc3 100644
--- a/weavedns/design.md
+++ b/site/weavedns-design.md
@@ -1,3 +1,8 @@
+---
+title: WeaveDNS Design Notes
+layout: default
+---
+
 # Weave DNS (service discovery) design
 
 The model is that each host has a service that is notified of
diff --git a/weavedns/README.md b/site/weavedns-readme.md
similarity index 99%
rename from weavedns/README.md
rename to site/weavedns-readme.md
index 70898077..cec6a961 100644
--- a/weavedns/README.md
+++ b/site/weavedns-readme.md
@@ -1,3 +1,8 @@
+---
+title: Automatic Discovery with WeaveDNS
+layout: default
+---
+
 # Weave DNS server
 
 The Weave DNS server answers name queries in a Weave network. This