diff --git a/security/doas/Makefile b/security/doas/Makefile
index d57954720d68..9d5ad124fb28 100644
--- a/security/doas/Makefile
+++ b/security/doas/Makefile
@@ -1,46 +1,50 @@
 PORTNAME=	doas
-PORTVERSION=	6.3p5
+PORTVERSION=	6.3p6
 CATEGORIES=	security
 
 MAINTAINER=	jsmith@resonatingmedia.com
 COMMENT=	Simple sudo alternative to run commands as another user
 
 LICENSE=	BSD2CLAUSE ISCL
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/LICENSE
 LICENSE_FILE_ISCL=		${WRKSRC}/LICENSE
 
 USES=	gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	slicer69
 
 MAKE_ENV+=	TARGETPATH=-DGLOBAL_PATH='\"${_GLOBAL_PATH}\"'
 
 BINMODE=	4755
 
 SUB_FILES=	pkg-message
 PLIST_FILES=	bin/doas \
+		bin/doasedit \
 		bin/vidoas \
 		etc/doas.conf.sample \
-		man/man5/doas.conf.5.gz \
 		man/man1/doas.1.gz \
+		man/man5/doas.conf.5.gz \
+		man/man8/doasedit.8.gz \
 		man/man8/vidoas.8.gz
 
 # These are upstream's default paths that are set for the GLOBAL_PATH variable
 # in doas.h since the 6.1 release. Those paths are then used for target user's
 # PATH variable instead of those of the original user.
 #
 # See also:
 #  * https://github.com/slicer69/doas/blob/6.1/doas.h#L36
 #  * https://github.com/slicer69/doas/releases/tag/6.1
 _GLOBAL_PATH?=	${LOCALBASE}/sbin:${LOCALBASE}/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/vidoas.final ${STAGEDIR}${PREFIX}/bin/vidoas
+	${INSTALL_SCRIPT} ${WRKSRC}/doasedit ${STAGEDIR}${PREFIX}/bin/doasedit
 	${INSTALL_MAN} ${WRKSRC}/doas.1.final ${STAGEDIR}${MAN1PREFIX}/man/man1/doas.1
 	${INSTALL_MAN} ${WRKSRC}/doas.conf.5.final ${STAGEDIR}${MAN5PREFIX}/man/man5/doas.conf.5
 	${INSTALL_MAN} ${WRKSRC}/vidoas.8.final ${STAGEDIR}${MAN5PREFIX}/man/man8/vidoas.8
+	${INSTALL_MAN} ${WRKSRC}/doasedit.8 ${STAGEDIR}${MAN5PREFIX}/man/man8/doasedit.8
 	${INSTALL_DATA} ${WRKSRC}/doas.conf.sample ${STAGEDIR}${PREFIX}/etc/doas.conf.sample
 
 .include <bsd.port.mk>
diff --git a/security/doas/distinfo b/security/doas/distinfo
index 880913bc0f47..f829fe818c33 100644
--- a/security/doas/distinfo
+++ b/security/doas/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622999760
-SHA256 (slicer69-doas-6.3p5_GH0.tar.gz) = 22a8ffdd759be7728d16127d13c423b6a6ada8a776c0c392835e69d2f101052c
-SIZE (slicer69-doas-6.3p5_GH0.tar.gz) = 31157
+TIMESTAMP = 1631559181
+SHA256 (slicer69-doas-6.3p6_GH0.tar.gz) = aa6f5d686942d9148506634e7b84af561af2564b689a287434023b1f272c064a
+SIZE (slicer69-doas-6.3p6_GH0.tar.gz) = 32193
diff --git a/security/doas/files/patch-doasedit b/security/doas/files/patch-doasedit
new file mode 100644
index 000000000000..61cad710e13e
--- /dev/null
+++ b/security/doas/files/patch-doasedit
@@ -0,0 +1,11 @@
+--- doasedit.orig	2021-09-13 18:56:31 UTC
++++ doasedit
+@@ -30,7 +30,7 @@ then
+    exit 3
+ fi
+ 
+-temp_file=$(mktemp --tmpdir doasedit.XXXXXXXX)
++temp_file=$(mktemp -t /tmp)
+ if [ ! $? ]
+ then
+    echo "Could not create temporary file."