diff --git a/build/tools.go b/build/tools.go
index f2376f3..89903de 100644
--- a/build/tools.go
+++ b/build/tools.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 package main
diff --git a/rpc/dataconn/timeoutconn/timeoutconn_readv_unsupported.go b/rpc/dataconn/timeoutconn/timeoutconn_readv_unsupported.go
index 7b15afd..11d9f86 100644
--- a/rpc/dataconn/timeoutconn/timeoutconn_readv_unsupported.go
+++ b/rpc/dataconn/timeoutconn/timeoutconn_readv_unsupported.go
@@ -1,3 +1,4 @@
+//go:build illumos || solaris
 // +build illumos solaris
 
 package timeoutconn
diff --git a/rpc/dataconn/timeoutconn/timoutconn_readv.go b/rpc/dataconn/timeoutconn/timoutconn_readv.go
index b2ba354..e58cfd0 100644
--- a/rpc/dataconn/timeoutconn/timoutconn_readv.go
+++ b/rpc/dataconn/timeoutconn/timoutconn_readv.go
@@ -1,5 +1,5 @@
-// +build !illumos
-// +build !solaris
+//go:build !illumos && !solaris
+// +build !illumos,!solaris
 
 package timeoutconn
 
diff --git a/util/tcpsock/tcpsock_freebind_freebsd.go b/util/tcpsock/tcpsock_freebind_freebsd.go
index d1b3d39..159b9b9 100644
--- a/util/tcpsock/tcpsock_freebind_freebsd.go
+++ b/util/tcpsock/tcpsock_freebind_freebsd.go
@@ -1,3 +1,4 @@
+//go:build freebsd
 // +build freebsd
 
 package tcpsock
diff --git a/util/tcpsock/tcpsock_freebind_linux.go b/util/tcpsock/tcpsock_freebind_linux.go
index 38d6749..b26be0d 100644
--- a/util/tcpsock/tcpsock_freebind_linux.go
+++ b/util/tcpsock/tcpsock_freebind_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package tcpsock
diff --git a/util/tcpsock/tcpsock_freebind_unsupported.go b/util/tcpsock/tcpsock_freebind_unsupported.go
index a015800..8acf345 100644
--- a/util/tcpsock/tcpsock_freebind_unsupported.go
+++ b/util/tcpsock/tcpsock_freebind_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux && !freebsd
 // +build !linux,!freebsd
 
 package tcpsock
diff --git a/zfs/zfs_pipe.go b/zfs/zfs_pipe.go
index 5828d32..9f90340 100644
--- a/zfs/zfs_pipe.go
+++ b/zfs/zfs_pipe.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package zfs