diff --git a/weaver/main.go b/weaver/main.go
index 674875b4..0bd360a2 100644
--- a/weaver/main.go
+++ b/weaver/main.go
@@ -22,7 +22,6 @@ func main() {
 
 	log.SetPrefix(weave.Protocol + " ")
 	log.SetFlags(log.Ldate | log.Ltime | log.Lmicroseconds)
-	log.Println(os.Args)
 
 	procs := runtime.NumCPU()
 	// packet sniffing can block an OS thread, so we need one thread
@@ -55,6 +54,17 @@ func main() {
 	flag.Parse()
 	peers = flag.Args()
 
+	options := make(map[string]string)
+	flag.Visit(func (f *flag.Flag) {
+		value := f.Value.String()
+		if f.Name == "password" {
+			value = "<elided>"
+		}
+		options[f.Name] = value
+	})
+	log.Println("Command line options:", options)
+	log.Println("Command line peers:", peers)
+
 	if ifaceName == "" {
 		fmt.Println("Missing required parameter 'iface'")
 		os.Exit(1)