diff --git a/conn.go b/conn.go
index a8b615476..ffaf1d0a7 100644
--- a/conn.go
+++ b/conn.go
@@ -337,14 +337,6 @@ func (c *Conn) connect(config ConnConfig, network, address string, tlsConfig *tl
 		Parameters:      make(map[string]string),
 	}
 
-	// Default to disabling TLS renegotiation.
-	//
-	// Go does not support (https://github.com/golang/go/issues/5742)
-	// PostgreSQL recommends disabling (http://www.postgresql.org/docs/9.4/static/runtime-config-connection.html#GUC-SSL-RENEGOTIATION-LIMIT)
-	if tlsConfig != nil {
-		startupMsg.Parameters["ssl_renegotiation_limit"] = "0"
-	}
-
 	// Copy default run-time params
 	for k, v := range config.RuntimeParams {
 		startupMsg.Parameters[k] = v
diff --git a/doc.go b/doc.go
index a4ff00e24..f3a169c8b 100644
--- a/doc.go
+++ b/doc.go
@@ -236,6 +236,10 @@ nil, then TLS will be disabled. If it is present, then it will be used to
 configure the TLS connection. This allows total configuration of the TLS
 connection.
 
+pgx doesn't send `ssl_renegotiation: 0` in the Postgres connection startup
+message anymore as of v3.3.0. If you need to set this parameter, do so
+via `ConnConfig.RuntimeParams`. Read more at https://github.com/jackc/pgx/pull/476.
+
 Logging
 
 pgx defines a simple logger interface. Connections optionally accept a logger