diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template
index aff4c59a2db..05ca58b55d4 100644
--- a/srcpkgs/containerd/template
+++ b/srcpkgs/containerd/template
@@ -1,30 +1,38 @@
 # Template file for 'containerd'
 pkgname=containerd
-version=1.7.17
-revision=2
+version=2.0.1
+revision=1
 build_style=go
-go_import_path=github.com/containerd/containerd
+build_helper="qemu"
+go_import_path=github.com/containerd/containerd/v2
 go_package="${go_import_path}/cmd/containerd
- ${go_import_path}/cmd/containerd-shim
- ${go_import_path}/cmd/containerd-shim-runc-v1
  ${go_import_path}/cmd/containerd-shim-runc-v2
  ${go_import_path}/cmd/ctr"
 go_ldflags="-X ${go_import_path}/version.Version=${version}
  -X ${go_import_path}/version.Revision=UNSET"
 go_build_tags="seccomp apparmor"
+make_check_args="-skip (^TestSetNegativeOomScoreAdjustmentWhenPrivileged$|^TestEnsureRemoveAllWithMount$|^TestBinDirVerifyImage$)"
 hostmakedepends="pkg-config go-md2man"
 makedepends="libbtrfs-devel libseccomp-devel"
 depends="runc"
+checkdepends="procps-ng"
 short_desc="Open and reliable container runtime"
 maintainer="Orphan <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/containerd/containerd"
 distfiles="https://github.com/containerd/containerd/archive/v${version}.tar.gz"
-checksum=fa16a85b3759a716728c00dda2fff8484b3811f62250724b77d05c115c4522a7
+checksum=a2958e6c97dcc44d2b3fc5f1e0c5cfb267d4620b26b51ff52cbe7bd07678707d
 make_dirs="/var/lib/containerd 0755 root root"
 
+# Cross builds fail with -fuse-ld=gold
+LDFLAGS="-fuse-ld=bfd"
+
 post_build() {
 	# Build the man pages
+	make bin/gen-manpages
+	vtargetrun bin/gen-manpages containerd.8 man
+	vtargetrun bin/gen-manpages ctr.8 man
+
 	for _i in containerd-config.toml.5 containerd-config.8 ; do
 		go-md2man -in "docs/man/$_i.md" -out "docs/man/$_i"
 	done
@@ -33,7 +41,16 @@ post_build() {
 post_install() {
 	vsv containerd
 
+	for _i in containerd.8 ctr.8 ; do
+		vman man/$_i
+	done
+
 	for _i in containerd-config.toml.5 containerd-config.8 ; do
 		vman docs/man/$_i
 	done
 }
+
+pre_check() {
+	# Skip vendor and integration tests
+	make_check_target=$(go list ./... | grep -v /vendor/ | grep -v /integration)
+}