diff --git a/site/kubernetes.md b/site/kubernetes.md
index 2bacfa6a..d6751b7e 100644
--- a/site/kubernetes.md
+++ b/site/kubernetes.md
@@ -5,7 +5,7 @@ search_type: Documentation
 ---
 
 > The recommended way of using Weave with Kubernetes is via the new
-> [Kubernetes Addon](/site/kube-addon.md). The instructions below
+> [Kubernetes Addon](/site/kubernetes/kube-addon.md). The instructions below
 > remain valid however, and are still the recommended method for
 > integrating with Mesos.
 
diff --git a/site/kubernetes/kube-addon.md b/site/kubernetes/kube-addon.md
index 5d2b8729..224310cf 100644
--- a/site/kubernetes/kube-addon.md
+++ b/site/kubernetes/kube-addon.md
@@ -43,7 +43,7 @@ recommend your master node has at least two CPU cores.
 > Alternatively, you can [configure CNI yourself](http://kubernetes.io/docs/admin/network-plugins/#cni)
 
 **Note:** If using the [Weave CNI
-Plugin](/site/cni-plugin.md) from a prior full install of Weave Net with your
+Plugin](/site/kubernetes.md) from a prior full install of Weave Net with your
 cluster, you must first uninstall it before applying the Weave-kube addon.
 Shut down Kubernetes, and _on all nodes_ perform the following:
 
diff --git a/site/overview/features.md b/site/overview/features.md
index bfe6a781..33e458c0 100644
--- a/site/overview/features.md
+++ b/site/overview/features.md
@@ -92,7 +92,7 @@ supports Docker swarm mode.
 
 Weave can be used as a plugin to systems that support the [Container Network Interface](https://github.com/appc/cni), such as Kubernetes and Mesosphere.
 
-See [Integrating Kubernetes and Mesos via the CNI Plugin](/site/cni-plugin.md) for more details.
+See [Integrating Kubernetes and Mesos via the CNI Plugin](/site/kubernetes.md) for more details.
 
 
 ### <a name="addressing"></a>IP Address Management (IPAM)
@@ -138,7 +138,7 @@ technique with Weave Net.
 
 ### <a name="network-policy"></a>Network Policy
 
-The Weave [Kubernetes Addon](/site/kube-addon.md) includes a network
+The Weave [Kubernetes Addon](/site/kubernetes/kube-addon.md) includes a network
 policy controller that implements [Kubernetes Network
 Policies](http://kubernetes.io/docs/user-guide/networkpolicies/).
 
diff --git a/site/tasks/manage/metrics.md b/site/tasks/manage/metrics.md
index 6f7d5f8d..93cbbbe7 100644
--- a/site/tasks/manage/metrics.md
+++ b/site/tasks/manage/metrics.md
@@ -5,8 +5,8 @@ search_type: Documentation
 ---
 
 Two endpoints are exposed: one for the Weave Net router, and, when deployed as
-a [Kubernetes Addon](/site/kube-addon.md), one for the [network policy
-controller](/site/kube-addon.md#npc).
+a [Kubernetes Addon](/site/kubernetes/kube-addon.md), one for the [network policy
+controller](/site/kubernetes/kube-addon.md#npc).
 
 ### Router Metrics