diff --git a/sysutils/fusefs-webdavfs/Makefile b/sysutils/fusefs-webdavfs/Makefile
index 3903adec64bf..ac98f2aae26c 100644
--- a/sysutils/fusefs-webdavfs/Makefile
+++ b/sysutils/fusefs-webdavfs/Makefile
@@ -1,61 +1,47 @@
 # Created by: Eugene Grosbein <eugen@FreeBSD.org>
 
 PORTNAME=	fusefs-webdavfs
-DISTVERSION=	g20181010
-PORTREVISION=	1
+DISTVERSION=	g20200520
 CATEGORIES=	sysutils
 
 MAINTAINER=	eugen@FreeBSD.org
 COMMENT=	FUSE filesystem for WEBDAV shares
 
 LICENSE=	BSD3CLAUSE BSD4CLAUSE MIT
 LICENSE_COMB=	multi
-LICENSE_FILE_BSD3CLAUSE=	${WRKDIR}/fuse-${FUSE_GH_TAGNAME}/LICENSE
-LICENSE_FILE_BSD4CLAUSE=	${WRKDIR}/getopt-${GETOPT_GH_TAGNAME}/LICENSE
+LICENSE_FILE_BSD3CLAUSE=	${WRKDIR}/webdavfs-${GH_TAGNAME}/vendor/bazil.org/fuse/LICENSE
+LICENSE_FILE_BSD4CLAUSE=	${WRKDIR}/webdavfs-${GH_TAGNAME}/vendor/github.com/pborman/getopt/LICENSE
 LICENSE_FILE_MIT=		${WRKDIR}/webdavfs-${GH_TAGNAME}/LICENSE.md
 LICENSE_DISTFILES_MIT=		${DISTNAME}${EXTRACT_SUFX}
-LICENSE_DISTFILES_BSD3CLAUSE=	${DISTNAME_fuse}_GH${_GITHUB_REV}${EXTRACT_SUFX}
-LICENSE_DISTFILES_BSD4CLAUSE=	${DISTNAME_getopt}_GH${_GITHUB_REV}${EXTRACT_SUFX}
+LICENSE_DISTFILES_BSD3CLAUSE=	bazil-fuse-${FUSE_GH_TAGNAME}_GH0${EXTRACT_SUFX}
+LICENSE_DISTFILES_BSD4CLAUSE=	pborman-getopt-${GETOPT_GH_TAGNAME}_GH0${EXTRACT_SUFX}
 
 # This needs to be Go 1.7 or newer.
-USES=		go
+USES=		go:modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	miquels
 GH_PROJECT=	webdavfs
-GH_TAGNAME=	c03fa01
+GH_TAGNAME=	117d633
 
-# 2018-08-11
-GETOPT_GH_ACCOUNT=	pborman
-GETOPT_GH_PROJECT=	getopt
-GETOPT_GH_TAGNAME=	2b5b3bf
-GETOPT_WRKSRCDIR=	${GO_WRKSRC}/../src/github.com/${GETOPT_GH_ACCOUNT}/${GETOPT_GH_PROJECT}
+# 2020-12-04 pborman/getopt
+GETOPT_GH_TAGNAME=	ee0cd42419d3
+# 2020-05-25 bazil/fuse
+FUSE_GH_TAGNAME=	65cc252bf669
+# 2020-05-20 golang/net
+NET_GH_TAGNAME=		59133d7f0dd7
 
-# 2018-04-21
-FUSE_GH_ACCOUNT=	bazil
-FUSE_GH_PROJECT=	fuse
-FUSE_GH_TAGNAME=	65cc252
-FUSE_WRKSRCDIR=		${GO_WRKSRC}/../src/bazil.org
-
-GH_ACCOUNT+=	${GETOPT_GH_ACCOUNT}:getopt ${FUSE_GH_ACCOUNT}:fuse
-GH_PROJECT+=	${GETOPT_GH_PROJECT}:getopt ${FUSE_GH_PROJECT}:fuse
-GH_TAGNAME+=	${GETOPT_GH_TAGNAME}:getopt ${FUSE_GH_TAGNAME}:fuse
+GH_TUPLE=	bazil:fuse:${FUSE_GH_TAGNAME}:bazil_fuse/vendor/bazil.org/fuse \
+		golang:net:${NET_GH_TAGNAME}:golang_net/vendor/golang.org/x/net \
+		pborman:getopt:${GETOPT_GH_TAGNAME}:pborman_getopt/vendor/github.com/pborman/getopt
 
 GO_TARGET=	:${PREFIX}/sbin/mount.webdavfs
 
 PLIST_FILES=	sbin/mount.webdavfs sbin/mount_webdavfs
 
 SUB_FILES=	pkg-message mount_webdavfs
 
-post-patch:
-	${GREP} -Flr --include '*.go' '"golang.org/x/net/context"' \
-	    ${WRKDIR}/fuse-${FUSE_GH_TAGNAME} ${WRKDIR}/webdavfs-${GH_TAGNAME} |\
-	    ${XARGS} ${REINPLACE_CMD} -i '' 's,golang.org/x/net/context,context,'
-	${MKDIR} ${GETOPT_WRKSRCDIR} ${FUSE_WRKSRCDIR}
-	${LN} -s ${WRKDIR}/getopt-${GETOPT_GH_TAGNAME}/v2 ${GETOPT_WRKSRCDIR}
-	${LN} -s ${WRKDIR}/fuse-${FUSE_GH_TAGNAME} ${FUSE_WRKSRCDIR}/fuse
-
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/mount_webdavfs ${STAGEDIR}${PREFIX}/sbin
 
 .include <bsd.port.mk>
diff --git a/sysutils/fusefs-webdavfs/distinfo b/sysutils/fusefs-webdavfs/distinfo
index 332a40c4c0b8..190ae655ec4c 100644
--- a/sysutils/fusefs-webdavfs/distinfo
+++ b/sysutils/fusefs-webdavfs/distinfo
@@ -1,7 +1,9 @@
-TIMESTAMP = 1545061102
-SHA256 (miquels-webdavfs-g20181010-c03fa01_GH0.tar.gz) = 3631c83203b5b75a4584702f47dde941c6fe6726d98a2e5d831a9d15284b2278
-SIZE (miquels-webdavfs-g20181010-c03fa01_GH0.tar.gz) = 20207
-SHA256 (pborman-getopt-2b5b3bf_GH0.tar.gz) = 057df545a42dd3b439ed73f3b93b9858888c729d4a623f82774c40e8f967b79c
-SIZE (pborman-getopt-2b5b3bf_GH0.tar.gz) = 38203
-SHA256 (bazil-fuse-65cc252_GH0.tar.gz) = bfff5537e4b9edd9cc757f9022fb3cb41574342bc82d7df3d1400b9d8764eae9
-SIZE (bazil-fuse-65cc252_GH0.tar.gz) = 187854
+TIMESTAMP = 1623902743
+SHA256 (miquels-webdavfs-g20200520-117d633_GH0.tar.gz) = a70042e90006a2da61c9a0c79eb717984d67ec60dfd5de7cc912e4aa429cabeb
+SIZE (miquels-webdavfs-g20200520-117d633_GH0.tar.gz) = 22930
+SHA256 (bazil-fuse-65cc252bf669_GH0.tar.gz) = 5586365a61aed3e37375ccd8b2341c7486e1b8ed46b37fa162b83ef56d84be2a
+SIZE (bazil-fuse-65cc252bf669_GH0.tar.gz) = 187896
+SHA256 (golang-net-59133d7f0dd7_GH0.tar.gz) = ea0a358ca3f8e31ba20c4f20177c4fb8a081ad5119543ea454cabfd8707b5b16
+SIZE (golang-net-59133d7f0dd7_GH0.tar.gz) = 1174691
+SHA256 (pborman-getopt-ee0cd42419d3_GH0.tar.gz) = 8eaa2477da03612e053997e0cc0f541947e8cbd3b6e89c4bed628341a58623f2
+SIZE (pborman-getopt-ee0cd42419d3_GH0.tar.gz) = 39691