diff --git a/cmd/L/main.go b/cmd/L/main.go
index 9979fd6..a89c13c 100644
--- a/cmd/L/main.go
+++ b/cmd/L/main.go
@@ -17,8 +17,8 @@ import (
 	"9fans.net/acme-lsp/internal/lsp/acmelsp/config"
 	"9fans.net/acme-lsp/internal/lsp/cmd"
 	"9fans.net/acme-lsp/internal/lsp/proxy"
+	p9client "9fans.net/go/plan9/client"
 	"9fans.net/internal/go-lsp/lsp/protocol"
-	p9client "github.com/fhs/9fans-go/plan9/client"
 	"github.com/sourcegraph/jsonrpc2"
 )
 
diff --git a/cmd/acmefocused/main.go b/cmd/acmefocused/main.go
index be7bd12..a556722 100644
--- a/cmd/acmefocused/main.go
+++ b/cmd/acmefocused/main.go
@@ -25,8 +25,8 @@ import (
 	"sync"
 
 	"9fans.net/acme-lsp/internal/p9service"
-	"github.com/fhs/9fans-go/acme"
-	"github.com/fhs/9fans-go/plan9/client"
+	"9fans.net/go/acme"
+	"9fans.net/go/plan9/client"
 )
 
 func main() {
diff --git a/go.mod b/go.mod
index 2f16000..15ee31a 100644
--- a/go.mod
+++ b/go.mod
@@ -3,9 +3,9 @@ module 9fans.net/acme-lsp
 go 1.21.9
 
 require (
+	9fans.net/go v0.0.5
 	9fans.net/internal/go-lsp v0.0.0-20240406143457-bb36aa85881a
 	github.com/BurntSushi/toml v0.3.1
-	github.com/fhs/9fans-go v0.0.0-fhs.20200606
 	github.com/google/go-cmp v0.3.0
 	github.com/sourcegraph/jsonrpc2 v0.2.0
 )
diff --git a/go.sum b/go.sum
index 4887a34..26fcdc6 100644
--- a/go.sum
+++ b/go.sum
@@ -1,12 +1,44 @@
+9fans.net/go v0.0.5 h1:u0H3Et5NowdVm56FDD+aWcDOao9zEo+zolNFsr8qyQk=
+9fans.net/go v0.0.5/go.mod h1:Rxvbbc1e+1TyGMjAvLthGTyO97t+6JMQ6ly+Lcs9Uf0=
 9fans.net/internal/go-lsp v0.0.0-20240406143457-bb36aa85881a h1:XAfaMe2Mt0aBSGuG6jfuJv3ZxkFyaV7kmtZzdizJDY4=
 9fans.net/internal/go-lsp v0.0.0-20240406143457-bb36aa85881a/go.mod h1:0/rCSlZo+66g+WpzTJuod4f7dHG6Yo8kxehfOhrt9RU=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/fhs/9fans-go v0.0.0-fhs.20200606 h1:kwqns/76paQLNLDx9I5UFkFG1z1tSqHq8a3j/I0kLr4=
-github.com/fhs/9fans-go v0.0.0-fhs.20200606/go.mod h1:9PelHyep+qBAEyYdGnqAa66ZGjWE0L8EJP+GIDz8p7M=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/sourcegraph/jsonrpc2 v0.2.0 h1:KjN/dC4fP6aN9030MZCJs9WQbTOjWHhrtKVpzzSrr/U=
 github.com/sourcegraph/jsonrpc2 v0.2.0/go.mod h1:ZafdZgk/axhT1cvZAPOhw+95nz2I/Ra5qMlU4gTRwIo=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
+golang.org/x/exp v0.0.0-20210405174845-4513512abef3/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
+golang.org/x/mobile v0.0.0-20210220033013-bdb1ca9a1e08/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210415045647-66c3f260301c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/internal/acme/acme.go b/internal/acme/acme.go
index 32a969d..a8b425e 100644
--- a/internal/acme/acme.go
+++ b/internal/acme/acme.go
@@ -3,7 +3,7 @@
 // Many of the functions in this package take a format string and optional
 // parameters.  In the documentation, the notation format, ... denotes the result
 // of formatting the string and arguments using fmt.Sprintf.
-package acme // import "github.com/fhs/9fans-go/acme"
+package acme // import "9fans.net/go/acme"
 
 import (
 	"bufio"
@@ -22,9 +22,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/fhs/9fans-go/draw"
-	"github.com/fhs/9fans-go/plan9"
-	"github.com/fhs/9fans-go/plan9/client"
+	"9fans.net/go/draw"
+	"9fans.net/go/plan9"
+	"9fans.net/go/plan9/client"
 )
 
 // A Win represents a single acme window and its control files.
diff --git a/internal/acme/acme_p9p.go b/internal/acme/acme_p9p.go
index b0627c1..948f272 100644
--- a/internal/acme/acme_p9p.go
+++ b/internal/acme/acme_p9p.go
@@ -3,7 +3,7 @@
 
 package acme
 
-import "github.com/fhs/9fans-go/plan9/client"
+import "9fans.net/go/plan9/client"
 
 func mountAcme() {
 	if Network == "" || Address == "" {
diff --git a/internal/acme/acme_plan9.go b/internal/acme/acme_plan9.go
index a60240d..9806262 100644
--- a/internal/acme/acme_plan9.go
+++ b/internal/acme/acme_plan9.go
@@ -1,7 +1,7 @@
 package acme
 
 import (
-	"github.com/fhs/9fans-go/plan9/client"
+	"9fans.net/go/plan9/client"
 )
 
 func mountAcme() {
diff --git a/internal/lsp/acmelsp/acmelsp.go b/internal/lsp/acmelsp/acmelsp.go
index 83d6bde..c433884 100644
--- a/internal/lsp/acmelsp/acmelsp.go
+++ b/internal/lsp/acmelsp/acmelsp.go
@@ -17,9 +17,9 @@ import (
 	"9fans.net/acme-lsp/internal/lsp"
 	"9fans.net/acme-lsp/internal/lsp/proxy"
 	"9fans.net/acme-lsp/internal/lsp/text"
+	"9fans.net/go/plan9"
+	"9fans.net/go/plumb"
 	"9fans.net/internal/go-lsp/lsp/protocol"
-	"github.com/fhs/9fans-go/plan9"
-	"github.com/fhs/9fans-go/plumb"
 )
 
 func CurrentWindowRemoteCmd(ss *ServerSet, fm *FileManager) (*RemoteCmd, error) {
diff --git a/internal/lsp/acmelsp/acmelsp_test.go b/internal/lsp/acmelsp/acmelsp_test.go
index dd837da..5a3ef9a 100644
--- a/internal/lsp/acmelsp/acmelsp_test.go
+++ b/internal/lsp/acmelsp/acmelsp_test.go
@@ -10,8 +10,8 @@ import (
 
 	"9fans.net/acme-lsp/internal/lsp"
 	"9fans.net/acme-lsp/internal/lsp/acmelsp/config"
+	"9fans.net/go/plumb"
 	"9fans.net/internal/go-lsp/lsp/protocol"
-	"github.com/fhs/9fans-go/plumb"
 	"github.com/google/go-cmp/cmp"
 )
 
diff --git a/internal/lsp/acmelsp/config/config.go b/internal/lsp/acmelsp/config/config.go
index bbdb63f..ce2210c 100644
--- a/internal/lsp/acmelsp/config/config.go
+++ b/internal/lsp/acmelsp/config/config.go
@@ -12,9 +12,9 @@ import (
 	"runtime"
 	"strings"
 
+	"9fans.net/go/plan9/client"
 	"9fans.net/internal/go-lsp/lsp/protocol"
 	"github.com/BurntSushi/toml"
-	"github.com/fhs/9fans-go/plan9/client"
 )
 
 // Flags represent a set of command line flags.