diff --git a/weave b/weave
index 9ac3dd9c..aafd8522 100755
--- a/weave
+++ b/weave
@@ -43,6 +43,7 @@ usage() {
     echo "weave version"
     echo "weave stop"
     echo "weave stop-dns"
+    echo "weave stop-proxy"
     echo "weave reset"
     echo "weave rmpeer       <peer_id>"
     echo
@@ -483,6 +484,13 @@ check_not_running() {
     esac
 }
 
+stop() {
+    if ! docker stop $1 >/dev/null 2>&1 ; then
+        echo "$2 is not running." >&2
+    fi
+    docker rm -f $1 >/dev/null 2>&1 || true
+}
+
 http_call_ip() {
     ip="$1"
     port="$2"
@@ -1033,18 +1041,16 @@ case "$COMMAND" in
         ;;
     stop)
         [ $# -eq 0 ] || usage
-        if ! docker stop $CONTAINER_NAME >/dev/null 2>&1 ; then
-            echo "Weave is not running." >&2
-        fi
-        docker rm -f $CONTAINER_NAME >/dev/null 2>&1 || true
+        stop $CONTAINER_NAME "Weave"
         conntrack -D -p udp --dport $PORT >/dev/null 2>&1 || true
         ;;
     stop-dns)
         [ $# -eq 0 ] || usage
-        if ! docker stop $DNS_CONTAINER_NAME >/dev/null 2>&1 ; then
-            echo "WeaveDNS is not running." >&2
-        fi
-        docker rm -f $DNS_CONTAINER_NAME >/dev/null 2>&1 || true
+        stop $DNS_CONTAINER_NAME "WeaveDNS"
+        ;;
+    stop-proxy)
+        [ $# -eq 0 ] || usage
+        stop $PROXY_CONTAINER_NAME "Proxy"
         ;;
     reset)
         [ $# -eq 0 ] || usage