diff --git a/sysutils/containerd/Makefile b/sysutils/containerd/Makefile
index be2778633126..a51fb93d0b52 100644
--- a/sysutils/containerd/Makefile
+++ b/sysutils/containerd/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	containerd
 DISTVERSIONPREFIX=v
-DISTVERSION=	1.5.7
+DISTVERSION=	1.5.8
 CATEGORIES=	sysutils
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Open and reliable container runtime
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash \
 		go:lang/go
 
 USES=		cpe gmake
 USE_GITHUB=	yes
 GH_SUBDIR=	src/github.com/containerd/containerd
 
 CPE_VENDOR=	linuxfoundation
 
 MAKE_ENV=	${GO_ENV} \
 		GOFLAGS="${GO_BUILDFLAGS}" \
 		VERSION="${DISTVERSION}"
 
 PLIST_FILES=	bin/containerd \
 		bin/containerd-shim \
 		bin/containerd-stress \
 		bin/ctr
 
 do-install:
 	@(cd ${WRKSRC} && ${SETENV} DESTDIR="${STAGEDIR}${PREFIX}" ${MAKE_CMD} install)
 
 .include <bsd.port.mk>
diff --git a/sysutils/containerd/distinfo b/sysutils/containerd/distinfo
index dcc1d7723803..414a6da57d16 100644
--- a/sysutils/containerd/distinfo
+++ b/sysutils/containerd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636027475
-SHA256 (containerd-containerd-v1.5.7_GH0.tar.gz) = 09be0cedea77568029aa0c7be9a323b89fa6886b402b5d223780a05b8c7cd45a
-SIZE (containerd-containerd-v1.5.7_GH0.tar.gz) = 7714453
+TIMESTAMP = 1638621202
+SHA256 (containerd-containerd-v1.5.8_GH0.tar.gz) = a41ab8d39393c9456941b477c33bb1b221a29b635f1c9a99523aab2f5e74f790
+SIZE (containerd-containerd-v1.5.8_GH0.tar.gz) = 7695062