diff --git a/go.mod b/go.mod
index 4f6cf358..99a48e04 100644
--- a/go.mod
+++ b/go.mod
@@ -3,9 +3,9 @@ module github.com/andoma-go/pgx/v5
 go 1.19
 
 require (
-	github.com/jackc/pgpassfile v1.0.0
-	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a
-	github.com/jackc/puddle/v2 v2.2.1
+	github.com/andoma-go/pgpassfile v1.0.0
+	github.com/andoma-go/pgservicefile v0.0.0-20240115131304-4a01ebf23c42
+	github.com/andoma-go/puddle/v2 v2.2.1
 	github.com/stretchr/testify v1.8.1
 	golang.org/x/crypto v0.17.0
 	golang.org/x/text v0.14.0
diff --git a/go.sum b/go.sum
index 1b39c053..38c2c76a 100644
--- a/go.sum
+++ b/go.sum
@@ -1,13 +1,13 @@
+github.com/andoma-go/pgpassfile v1.0.0 h1:IJZAs6b/3pmEnq0kAvBWh2qEPsQOleHVIzMzj8WwT4w=
+github.com/andoma-go/pgpassfile v1.0.0/go.mod h1:JWSeNzz3oUhysdQgq1OL4PyV3R4QW/KyPvqqEykyN88=
+github.com/andoma-go/pgservicefile v0.0.0-20240115131304-4a01ebf23c42 h1:TpYPPFFHiqFDM0luTfDiHBdGSgYU+uloD+FaA87BBRk=
+github.com/andoma-go/pgservicefile v0.0.0-20240115131304-4a01ebf23c42/go.mod h1:iRoNsjH6Wp9dCo0oiT1geVOjYusx6RUIdzCJNktFso0=
+github.com/andoma-go/puddle/v2 v2.2.1 h1:cobxhnZmYsynXC9k8xcJd97ytlCa/Pe5kgj69pgncrE=
+github.com/andoma-go/puddle/v2 v2.2.1/go.mod h1:iWHUHOdNa1/WJ6MyJAZ5qeTI/sJMbjVK/Gw4JLjh4Dw=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
-github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
-github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
diff --git a/pgconn/config.go b/pgconn/config.go
index 5c3ba062..6cccdbe9 100644
--- a/pgconn/config.go
+++ b/pgconn/config.go
@@ -17,9 +17,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/andoma-go/pgpassfile"
+	"github.com/andoma-go/pgservicefile"
 	"github.com/andoma-go/pgx/v5/pgproto3"
-	"github.com/jackc/pgpassfile"
-	"github.com/jackc/pgservicefile"
 )
 
 type AfterConnectFunc func(ctx context.Context, pgconn *PgConn) error
diff --git a/pgxpool/conn.go b/pgxpool/conn.go
index c1cc83ac..0d0c0eb0 100644
--- a/pgxpool/conn.go
+++ b/pgxpool/conn.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/andoma-go/pgx/v5"
 	"github.com/andoma-go/pgx/v5/pgconn"
-	"github.com/jackc/puddle/v2"
+	"github.com/andoma-go/puddle/v2"
 )
 
 // Conn is an acquired *pgx.Conn from a Pool.
diff --git a/pgxpool/pool.go b/pgxpool/pool.go
index 9180e679..c515ca23 100644
--- a/pgxpool/pool.go
+++ b/pgxpool/pool.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/andoma-go/pgx/v5"
 	"github.com/andoma-go/pgx/v5/pgconn"
-	"github.com/jackc/puddle/v2"
+	"github.com/andoma-go/puddle/v2"
 )
 
 var defaultMaxConns = int32(4)
diff --git a/pgxpool/stat.go b/pgxpool/stat.go
index cfa0c4c5..a5a118c7 100644
--- a/pgxpool/stat.go
+++ b/pgxpool/stat.go
@@ -3,7 +3,7 @@ package pgxpool
 import (
 	"time"
 
-	"github.com/jackc/puddle/v2"
+	"github.com/andoma-go/puddle/v2"
 )
 
 // Stat is a snapshot of Pool statistics.