client.go      | 2 +-
 tracker/udp.go | 2 +-

diff --git a/client.go b/client.go
index 68464da92abecd3a3eb6a7c27c77f1ee9b732350..1831e2c5d5d7422215fa19a9286f3b5c08d98a4f 100644
--- a/client.go
+++ b/client.go
@@ -2533,7 +2533,7 @@ }
 
 func (me *Client) AddDHTNodes(nodes []string) {
 	for _, n := range nodes {
-		hmp := missinggo.SplitHostPort(n)
+		hmp := missinggo.SplitHostMaybePort(n)
 		ip := net.ParseIP(hmp.Host)
 		if ip == nil {
 			log.Printf("won't add DHT node with bad IP: %q", hmp.Host)
diff --git a/tracker/udp.go b/tracker/udp.go
index 2f91c501f7a4449d1f2d01b4041ea01fffe83f6b..539a5cce08afece86dc8dd82cacc10aff6cf8e8b 100644
--- a/tracker/udp.go
+++ b/tracker/udp.go
@@ -250,7 +250,7 @@ 		return nil
 	}
 	c.connectionId = connectRequestConnectionId
 	if c.socket == nil {
-		hmp := missinggo.SplitHostPort(c.url.Host)
+		hmp := missinggo.SplitHostMaybePort(c.url.Host)
 		if hmp.NoPort {
 			hmp.NoPort = false
 			hmp.Port = 80