diff --git a/sysutils/containerd/Makefile b/sysutils/containerd/Makefile
index bc30877121a1..9820300a8428 100644
--- a/sysutils/containerd/Makefile
+++ b/sysutils/containerd/Makefile
@@ -1,33 +1,36 @@
 PORTNAME=	containerd
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.6.2
+PORTREVISION=	1
 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
 
+USE_RC_SUBR=	containerd
+
 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}" ${MAKE_CMD} install)
 
 .include <bsd.port.mk>
diff --git a/sysutils/containerd/files/containerd.in b/sysutils/containerd/files/containerd.in
new file mode 100644
index 000000000000..634a3d5b6db4
--- /dev/null
+++ b/sysutils/containerd/files/containerd.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# PROVIDE: containerd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable containerd:
+#
+# containerd_enable="YES"
+
+. /etc/rc.subr
+
+name="containerd"
+rcvar="containerd_enable"
+
+pidfile="/var/run/${name}.pid"
+command="/usr/sbin/daemon"
+command_args="-P ${pidfile} -r -S -t ${name} -T ${name} %%LOCALBASE%%/bin/containerd"
+
+load_rc_config $name
+: ${containerd_enable:=no}
+
+# containerd needs to execute a runtime (eg. runj)
+PATH="${PATH}:%%PREFIX%%/sbin:%%PREFIX%%/bin"
+
+run_rc_command "$1"