diff --git a/contrib/dns/MAINTAINERS.md b/cluster/addons/dns/MAINTAINERS.md
similarity index 100%
rename from contrib/dns/MAINTAINERS.md
rename to cluster/addons/dns/MAINTAINERS.md
diff --git a/contrib/dns/README.md b/cluster/addons/dns/README.md
similarity index 92%
rename from contrib/dns/README.md
rename to cluster/addons/dns/README.md
index 865b7e95103..792f3ce688a 100644
--- a/contrib/dns/README.md
+++ b/cluster/addons/dns/README.md
@@ -29,11 +29,11 @@ DNS_REPLICAS=2
 
 sed -e "s/{DNS_DOMAIN}/$DNS_DOMAIN/g" \
     -e "s/{DNS_REPLICAS}/$DNS_REPLICAS/g" \
-    ./contrib/dns/skydns-rc.yaml.in \
+    ./cluster/addons/dns/skydns-rc.yaml.in \
     | ./cluster/kubectl.sh create -f -
 
 sed -e "s/{DNS_SERVER_IP}/$DNS_SERVER_IP/g" \
-    ./contrib/dns/skydns-svc.yaml.in \
+    ./cluster/addons/dns/skydns-svc.yaml.in \
     | ./cluster/kubectl.sh create -f -
 ```
 
@@ -48,6 +48,6 @@ that to etcd for SkyDNS to find.
 
 ## Known issues
 DNS resolution does not work from nodes directly, but it DOES work for
-containers.  As best I can figure out, this is some oddity around DNAT and
+containers.  As best I (thockin) can figure out, this is some oddity around DNAT and
 localhost in the kernel.  I think I have a workaround, but it's not quite baked
 as of the this writing (11/6/2014).
diff --git a/contrib/dns/kube2sky/Dockerfile b/cluster/addons/dns/kube2sky/Dockerfile
similarity index 100%
rename from contrib/dns/kube2sky/Dockerfile
rename to cluster/addons/dns/kube2sky/Dockerfile
diff --git a/contrib/dns/kube2sky/Makefile b/cluster/addons/dns/kube2sky/Makefile
similarity index 100%
rename from contrib/dns/kube2sky/Makefile
rename to cluster/addons/dns/kube2sky/Makefile
diff --git a/contrib/dns/kube2sky/README.md b/cluster/addons/dns/kube2sky/README.md
similarity index 100%
rename from contrib/dns/kube2sky/README.md
rename to cluster/addons/dns/kube2sky/README.md
diff --git a/contrib/dns/kube2sky/kube2sky.go b/cluster/addons/dns/kube2sky/kube2sky.go
similarity index 100%
rename from contrib/dns/kube2sky/kube2sky.go
rename to cluster/addons/dns/kube2sky/kube2sky.go
diff --git a/contrib/dns/skydns-rc.yaml.in b/cluster/addons/dns/skydns-rc.yaml.in
similarity index 100%
rename from contrib/dns/skydns-rc.yaml.in
rename to cluster/addons/dns/skydns-rc.yaml.in
diff --git a/contrib/dns/skydns-svc.yaml.in b/cluster/addons/dns/skydns-svc.yaml.in
similarity index 100%
rename from contrib/dns/skydns-svc.yaml.in
rename to cluster/addons/dns/skydns-svc.yaml.in
diff --git a/contrib/dns/skydns/Dockerfile b/cluster/addons/dns/skydns/Dockerfile
similarity index 100%
rename from contrib/dns/skydns/Dockerfile
rename to cluster/addons/dns/skydns/Dockerfile
diff --git a/contrib/dns/skydns/Makefile b/cluster/addons/dns/skydns/Makefile
similarity index 100%
rename from contrib/dns/skydns/Makefile
rename to cluster/addons/dns/skydns/Makefile
diff --git a/contrib/dns/skydns/README.md b/cluster/addons/dns/skydns/README.md
similarity index 100%
rename from contrib/dns/skydns/README.md
rename to cluster/addons/dns/skydns/README.md
diff --git a/cluster/kube-up.sh b/cluster/kube-up.sh
index db3b294bc93..063d3c63412 100755
--- a/cluster/kube-up.sh
+++ b/cluster/kube-up.sh
@@ -43,14 +43,14 @@ echo "... calling setup-monitoring" >&2
 setup-monitoring
 
 if [[ "${ENABLE_CLUSTER_DNS}" == "true" ]]; then
-  echo "Installing cluster DNS"
+  echo ".. setting up cluster DNS"
   sed -e "s/{DNS_DOMAIN}/$DNS_DOMAIN/g" \
       -e "s/{DNS_REPLICAS}/$DNS_REPLICAS/g" \
-      "${KUBE_ROOT}/contrib/dns/skydns-rc.yaml.in" \
+      "${KUBE_ROOT}/cluster/addons/dns/skydns-rc.yaml.in" \
       | "${KUBE_ROOT}/cluster/kubectl.sh" create -f -
 
   sed -e "s/{DNS_SERVER_IP}/$DNS_SERVER_IP/g" \
-      "${KUBE_ROOT}/contrib/dns/skydns-svc.yaml.in" \
+      "${KUBE_ROOT}/cluster/addons/dns/skydns-svc.yaml.in" \
       | "${KUBE_ROOT}/cluster/kubectl.sh" create -f -
 fi