diff --git a/proxy/proxy.go b/proxy/proxy.go
index 553ead7..f6026b9 100644
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -79,8 +79,13 @@
 	}
 
 	switch u.Scheme {
-	case "socks5":
-		return SOCKS5("tcp", u.Host, auth, forward)
+	case "socks5", "socks5h":
+		addr := u.Hostname()
+		port := u.Port()
+		if port == "" {
+			port = "1080"
+		}
+		return SOCKS5("tcp", net.JoinHostPort(addr, port), auth, forward)
 	}
 
 	// If the scheme doesn't match any of the built-in schemes, see if it
diff --git a/proxy/proxy_test.go b/proxy/proxy_test.go
index 0be1b42..d260d69 100644
--- a/proxy/proxy_test.go
+++ b/proxy/proxy_test.go
@@ -12,6 +12,7 @@
 	"strings"
 	"testing"
 
+	"golang.org/x/net/internal/socks"
 	"golang.org/x/net/internal/sockstest"
 )
 
@@ -53,6 +54,7 @@
 		{allProxyEnv: "127.0.0.1:8080", noProxyEnv: "localhost, 127.0.0.1", wantTypeOf: direct{}},
 		{allProxyEnv: "ftp://example.com:8000", noProxyEnv: "localhost, 127.0.0.1", wantTypeOf: direct{}},
 		{allProxyEnv: "socks5://example.com:8080", noProxyEnv: "localhost, 127.0.0.1", wantTypeOf: &PerHost{}},
+		{allProxyEnv: "socks5h://example.com", wantTypeOf: &socks.Dialer{}},
 		{allProxyEnv: "irc://example.com:8000", wantTypeOf: dummyDialer{}},
 		{noProxyEnv: "localhost, 127.0.0.1", wantTypeOf: direct{}},
 		{wantTypeOf: direct{}},