diff --git a/weave/docker-ns b/weave/docker-ns
index 1a5a9d2e..6f4240c0 100755
--- a/weave/docker-ns
+++ b/weave/docker-ns
@@ -29,7 +29,7 @@ NSPID=$DOCKERPID
 [ -f /var/run/netns/$NSPID ] && rm -f /var/run/netns/$NSPID
 ln -s /proc/$NSPID/ns/net /var/run/netns/$NSPID
 
-ip netns exec $NSPID $@
+ip netns exec $NSPID "$@"
 
 [ -f /var/run/netns/$NSPID ] && rm -f /var/run/netns/$NSPID
 
diff --git a/weave/wedo b/weave/wedo
index 857a866b..a325bf7c 100755
--- a/weave/wedo
+++ b/weave/wedo
@@ -33,11 +33,11 @@ MACADDR=$(</sys/class/net/$BRIDGE/address)
 
 case "$COMMAND" in
     launch)
-        CONTAINER=$(docker run -d --name=weave -p 6783:6783/tcp -p 6783:6783/udp $WEAVE_DOCKER_ARGS zettio/weave -name $MACADDR $@)
+        CONTAINER=$(docker run -d --name=weave -p 6783:6783/tcp -p 6783:6783/udp $WEAVE_DOCKER_ARGS zettio/weave -name $MACADDR "$@")
         IFACE=eth0
         ;;
     run)
-        CONTAINER=$(docker run -d $@)
+        CONTAINER=$(docker run -d "$@")
         IFACE=$CONTAINER_IFNAME
         ;;
 esac