diff --git a/site/proxy.md b/site/proxy.md
index 9ca48570..4fce9011 100644
--- a/site/proxy.md
+++ b/site/proxy.md
@@ -18,6 +18,7 @@ instead of `weave run`.
  * [Automatic discovery](#dns)
  * [Multi-host example](#multi-host)
  * [Securing the docker communication with TLS](#tls)
+ * [Troubleshooting](#troubleshooting)
 
 ## <a name="setup"></a>Setup
 
@@ -195,3 +196,28 @@ with
 which is exactly the same configuration as when connecting to the
 docker daemon directly, except that the specified port is the weave
 proxy port.
+
+## <a name="troubleshooting"></a>Troubleshooting
+
+The command
+
+    weave status
+
+reports on the current status of various weave components, including
+the proxy:
+
+````
+...
+weave proxy git-03ede29e7ee4
+Listen address is :12375
+Docker address is unix:///var/run/docker.sock
+TLS off
+DNS off
+IPAM off
+````
+
+Information on the operation of the proxy can be obtained from the
+weaveproxy container logs with
+
+    docker logs weaveproxy
+
diff --git a/site/troubleshooting.md b/site/troubleshooting.md
index 4d5de954..9caa876d 100644
--- a/site/troubleshooting.md
+++ b/site/troubleshooting.md
@@ -139,9 +139,10 @@ not currently connected to.  Each line contains some information about
 what went wrong the last time; whether it is attempting to connect or
 is waiting for a while before connecting again.
 
-There may also be further sections for
-[IP allocator](ipam.html#troubleshooting) and
-[weaveDNS](weavedns.html#troubleshooting).
+There may also be further sections for the
+[IP address allocator](ipam.html#troubleshooting),
+[weaveDNS](weavedns.html#troubleshooting), and
+[proxy](proxy.html#troubleshooting).
 
 ### <a name="list-attached-containers"></a>List attached containers