diff --git a/sysutils/containerd/Makefile b/sysutils/containerd/Makefile
index 5153d5262436f..d7df1f306841e 100644
--- a/sysutils/containerd/Makefile
+++ b/sysutils/containerd/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	containerd
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.6.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	decke@FreeBSD.org
@@ -33,4 +33,8 @@ PLIST_FILES=	bin/containerd \
 do-install:
 	@(cd ${WRKSRC} && ${SETENV} DESTDIR="${STAGEDIR}" ${MAKE_CMD} install)
 
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/containerd
+	${CP} ${FILESDIR}/*.sample ${STAGEDIR}${PREFIX}/etc/containerd
+
 .include <bsd.port.mk>
diff --git a/sysutils/containerd/files/config.toml.sample b/sysutils/containerd/files/config.toml.sample
new file mode 100644
index 0000000000000..185ca1677aa8d
--- /dev/null
+++ b/sysutils/containerd/files/config.toml.sample
@@ -0,0 +1,35 @@
+state = "/var/run/containerd"
+temp = ""
+version = 2
+
+[cgroup]
+  path = ""
+
+[debug]
+  address = "/var/run/containerd/debug.sock"
+  format = ""
+  gid = 0
+  level = "info"
+  uid = 0
+
+[grpc]
+  address = "/var/run/containerd/containerd.sock"
+  gid = 0
+  max_recv_message_size = 16777216
+  max_send_message_size = 16777216
+  tcp_address = ""
+  tcp_tls_ca = ""
+  tcp_tls_cert = ""
+  tcp_tls_key = ""
+  uid = 0
+
+[plugins]
+  [plugins."io.containerd.service.v1.diff-service"]
+    default = ["walking"]
+  [plugins."io.containerd.gc.v1.scheduler"]
+    pause_threshold = 0.02
+    deletion_threshold = 0
+    mutation_threshold = 100
+    schedule_delay = "0s"
+    startup_delay = "100ms"
+
diff --git a/sysutils/containerd/files/containerd.in b/sysutils/containerd/files/containerd.in
index 634a3d5b6db4b..47b0bc4a39cd6 100644
--- a/sysutils/containerd/files/containerd.in
+++ b/sysutils/containerd/files/containerd.in
@@ -13,12 +13,13 @@
 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_args:=""}
+
+pidfile="/var/run/${name}.pid"
+command="/usr/sbin/daemon"
+command_args="-P ${pidfile} -r -S -t ${name} -T ${name} %%LOCALBASE%%/bin/containerd ${containerd_args}"
 
 # containerd needs to execute a runtime (eg. runj)
 PATH="${PATH}:%%PREFIX%%/sbin:%%PREFIX%%/bin"