torrent.go           | 5 ++++-
 webtorrent/client.go | 4 ++--

diff --git a/torrent.go b/torrent.go
index 4875bf5b836e00c4935ab4a6c62dccbe66246dd2..a5c51bf89c847a6dc7aec782fe276ae2212c4b4a 100644
--- a/torrent.go
+++ b/torrent.go
@@ -1317,7 +1317,10 @@ 	}
 	sl := func() torrentTrackerAnnouncer {
 		switch u.Scheme {
 		case "ws", "wss":
-			wst := websocketTracker{*u, webtorrent.NewClient(t.cl.peerID, t.infoHash, t.onWebRtcConn, t.logger)}
+			wst := websocketTracker{*u, webtorrent.NewClient(t.cl.peerID, t.infoHash, t.onWebRtcConn,
+				t.logger.WithText(func(m log.Msg) string {
+					return fmt.Sprintf("%q: %v", u.String(), m.Text())
+				}))}
 			go func() {
 				err := wst.Client.Run(t.announceRequest(tracker.Started), u.String())
 				if err != nil {
diff --git a/webtorrent/client.go b/webtorrent/client.go
index 54ebf26487346879432384e43dbb8df557bac58c..9d232d02277ee4077ebdd2ed8ce8bda01315e313 100644
--- a/webtorrent/client.go
+++ b/webtorrent/client.go
@@ -180,7 +180,7 @@ 			if !ok {
 				c.logger.WithValues(log.Warning).Printf("could not find offer for id %q", ar.OfferID)
 				continue
 			}
-			log.Printf("offer %q got answer %v", ar.OfferID, *ar.Answer)
+			c.logger.Printf("offer %q got answer %v", ar.OfferID, *ar.Answer)
 			err = offer.transport.SetAnswer(*ar.Answer, func(dc datachannel.ReadWriteCloser) {
 				c.onConn(dc, DataChannelContext{
 					Local:        offer.originalOffer,
@@ -190,7 +190,7 @@ 					LocalOffered: true,
 				})
 			})
 			if err != nil {
-				return fmt.Errorf("failed to sent answer: %v", err)
+				return fmt.Errorf("failed to sent answer: %w", err)
 			}
 		}
 	}