diff --git a/net/cloudflared/Makefile b/net/cloudflared/Makefile
index 23ee2146d8d4..44f09c115df2 100644
--- a/net/cloudflared/Makefile
+++ b/net/cloudflared/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	cloudflared
-DISTVERSION=	2021.3.5
+DISTVERSION=	2021.4.0
 CATEGORIES=	net www
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Cloudflare's Argo Tunnel client
 
 LICENSE=	cloudflare
 LICENSE_NAME=	cloudflare
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	no-dist-sell no-pkg-sell
 
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		cpe go:modules
 USE_RC_SUBR=	${PORTNAME}
 USE_GITHUB=	yes
 GH_ACCOUNT=	cloudflare
 CPE_VENDOR=	cloudflare
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 GO_TARGET=	${GO_PKGNAME}/cmd/cloudflared
 GO_BUILDFLAGS+=	-ldflags '-s -w -X main.Version=${PORTVERSION}'
 
 PLIST_FILES=	bin/${PORTNAME}
 RESTRICTED=	Not sure if we are allowed to redistribute it.
 
 .include <bsd.port.mk>
diff --git a/net/cloudflared/distinfo b/net/cloudflared/distinfo
index 91794f38bddd..585830e41266 100644
--- a/net/cloudflared/distinfo
+++ b/net/cloudflared/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616836174
-SHA256 (cloudflare-cloudflared-2021.3.5_GH0.tar.gz) = 1521846ee97e066ca18ec4cefed1a84b634b57d989c76d186086fff19b4746d4
-SIZE (cloudflare-cloudflared-2021.3.5_GH0.tar.gz) = 7471623
+TIMESTAMP = 1618260846
+SHA256 (cloudflare-cloudflared-2021.4.0_GH0.tar.gz) = d3d395f1cdabcd7421c647bf4c9f64dc799206c5d9042f797d65e5356f84f99d
+SIZE (cloudflare-cloudflared-2021.4.0_GH0.tar.gz) = 7471792
diff --git a/net/cloudflared/files/cloudflared.in b/net/cloudflared/files/cloudflared.in
index d54cd1d55846..45ceb4e384f5 100644
--- a/net/cloudflared/files/cloudflared.in
+++ b/net/cloudflared/files/cloudflared.in
@@ -1,34 +1,36 @@
 #!/bin/sh
 
 # PROVIDE: cloudflared
 # REQUIRE: cleanvar SERVERS
 #
 # Options to configure cloudflared via /etc/rc.conf:
 #
 # cloudflared_enable (bool)	Enable service on boot
 #				Default: NO
 #
 # cloudflared_conf (str)	Config file to use
 #				Default: %%ETCDIR%%/config.yml
 #
-# cloudflared_mode (str)	Mode to run cloudflared as (tunnel, or proxy-dns)
-#				Default: tunnel
+# cloudflared_mode (str)	Mode to run cloudflared as (e.g. 'tunnel', 'tunnel run'
+#				or 'proxy-dns'). Should you use the default, a free
+#				tunnel is set up for you.
+#				Default: "tunnel"
 
 . /etc/rc.subr
 
 name="cloudflared"
 rcvar="cloudflared_enable"
-logfile="/var/log/cloudflared/cloudflared.log"
+logfile="/var/log/cloudflared.log"
 pidfile="/var/run/cloudflared.pid"
 procname="%%PREFIX%%/bin/cloudflared"
 
 load_rc_config $name
 
 : ${cloudflared_enable:="NO"}
 : ${cloudflared_conf:="%%ETCDIR%%/config.yml"}
 : ${cloudflared_mode:="tunnel"}
 
 command="/usr/sbin/daemon"
-command_args="-o ${logfile} -p ${pidfile} -f ${procname} --cred-file ${cloudflared_conf} ${cloudflared_mode}"
+command_args="-o ${logfile} -p ${pidfile} -f ${procname} --config ${cloudflared_conf} ${cloudflared_mode}"
 
 run_rc_command "$1"