diff --git a/security/obfs4proxy-tor/Makefile b/security/obfs4proxy-tor/Makefile
index 5de16276ac6a..1b894402932f 100644
--- a/security/obfs4proxy-tor/Makefile
+++ b/security/obfs4proxy-tor/Makefile
@@ -1,46 +1,49 @@
 PORTNAME=	obfs4proxy
-DISTVERSION=	0.0.11
-PORTREVISION=	2
+DISTVERSION=	0.0.12
 CATEGORIES=	security net
-MASTER_SITES=	https://people.torproject.org/~yawning/releases/${PORTNAME}/
 PKGNAMESUFFIX=	-tor
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Pluggable transport proxy for Tor (obfs4, The Obfuscator)
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKDIR}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go:modules tar:xz
 
 CPE_VENDOR=	torproject
 
 USE_GITHUB=	nodefault
-GH_TUPLE=	agl:ed25519:5312a61:ed25519/vendor/github.com/agl/ed25519 \
-		dchest:siphash:v1.2.1:siphash/vendor/github.com/dchest/siphash \
+GH_TUPLE=	FiloSottile:edwards25519:390f27c3be20:filosottile_edwards25519/vendor/filippo.io/edwards25519 \
+		dchest:siphash:v1.2.2:siphash/vendor/github.com/dchest/siphash \
 		dsnet:compress:v0.0.1:dsnet_compress/vendor/github.com/dsnet/compress \
-		golang:crypto:9e8e0b3:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:7b1cca2:golang_net/vendor/golang.org/x/net \
+		golang:crypto:a769d52b0f97:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:e18ecbb05110:golang_net/vendor/golang.org/x/net \
+		golang:sys:665e8c7367d1:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \
-		golang:sys:b09fb70:golang_sys/vendor/golang.org/x/sys \
-		torbsd:goptlib:v1.1.0:goptlib/vendor/git.torproject.org/pluggable-transports/goptlib.git \
-		Yawning:bsaes:26d1add:Yawning_bsaes/vendor/git.schwanenlied.me/yawning/bsaes.git
+		torbsd:goptlib:v1.1.0:goptlib/vendor/git.torproject.org/pluggable-transports/goptlib.git
 
-USE_GITLAB=	nodefault
-GL_TUPLE=	yawning:utls:ad258eb64575fd468dbd2f93ef229df5f7fe72b4:yawning_utls/vendor/gitlab.com/yawning/utls.git
+USE_GITLAB=	yes
+GL_ACCOUNT=	yawning
+GL_PROJECT=	obfs4
+GL_COMMIT=	a564bc3840bc788605e1a8155f4b95ce0d70c6db
+GL_TUPLE=	yawning:bsaes:0a714cd429ec754482b4001e918db30cd2094405:yawning_bsaes/vendor/gitlab.com/yawning/bsaes.git \
+		yawning:edwards25519-extra:2f91fcc9fbdb888f3c795849b6777940135559b7:yawning_edwards25519extra/vendor/gitlab.com/yawning/edwards25519-extra.git \
+		yawning:utls:f1bcf4b40e4596d0ccd1dbf8f3a9f4922f9759ca:yawning_utls/vendor/gitlab.com/yawning/utls.git
 
-GO_TARGET=	../obfs4proxy
+GO_PKGNAME=	gitlab.com/yawning/obfs4
+GO_TARGET=	./obfs4proxy
 
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	bin/obfs4proxy \
 		man/man1/obfs4proxy.1.gz
 
 post-patch:
-	${LN} -s ${WRKSRC}/vendor ${WRKDIR}
+	${LN} -s ${WRKSRC} ${WRKSRC}/vendor/${GO_PKGNAME}
 
 post-install:
-	${INSTALL_MAN} ${WRKDIR}/doc/obfs4proxy.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/obfs4proxy.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/security/obfs4proxy-tor/distinfo b/security/obfs4proxy-tor/distinfo
index 65ca2f982fbb..872d0bc1179b 100644
--- a/security/obfs4proxy-tor/distinfo
+++ b/security/obfs4proxy-tor/distinfo
@@ -1,23 +1,27 @@
-TIMESTAMP = 1617892099
-SHA256 (obfs4proxy-0.0.11.tar.xz) = 8aa777a7ae17610dd3028379b249aae24a8d964cfe9fe7486120efe6d676fd3b
-SIZE (obfs4proxy-0.0.11.tar.xz) = 70952
-SHA256 (agl-ed25519-5312a61_GH0.tar.gz) = 8508e21ca8bf39df655cd7d7ade16b168530a2dbc3791c00f0d2a62ca9003faa
-SIZE (agl-ed25519-5312a61_GH0.tar.gz) = 107273
-SHA256 (dchest-siphash-v1.2.1_GH0.tar.gz) = 90c5e8ba62b64b2f76ed58c87dd50456171610049bef51fd71bc593c1744fad2
-SIZE (dchest-siphash-v1.2.1_GH0.tar.gz) = 10729
+TIMESTAMP = 1642179697
+SHA256 (obfs4proxy-0.0.12.tar.xz) = 4e0e3c59c33cff7028d4b989c2c423461babce91c11030a69195a608d4dfc36e
+SIZE (obfs4proxy-0.0.12.tar.xz) = 91230
+SHA256 (FiloSottile-edwards25519-390f27c3be20_GH0.tar.gz) = 7c6d366447a2dd9d2f2ead98d9eb9f52f7f14a1f6f767670b4a2a45fec136989
+SIZE (FiloSottile-edwards25519-390f27c3be20_GH0.tar.gz) = 39893
+SHA256 (dchest-siphash-v1.2.2_GH0.tar.gz) = 1edd183315f198d37f7c6308e31f89868d0c0692b893ee7827e497eeb9dca0b0
+SIZE (dchest-siphash-v1.2.2_GH0.tar.gz) = 10705
 SHA256 (dsnet-compress-v0.0.1_GH0.tar.gz) = 345332d6a147f052cf4a34edb5187b323f06f012f842bb49fd05ec55f5339c5b
 SIZE (dsnet-compress-v0.0.1_GH0.tar.gz) = 9962544
-SHA256 (golang-crypto-9e8e0b3_GH0.tar.gz) = 0ba35f07dbefcb3c9258d661ddb9a6ed71322d07ec9b8c56b22038896e4c331b
-SIZE (golang-crypto-9e8e0b3_GH0.tar.gz) = 1732606
-SHA256 (golang-net-7b1cca2_GH0.tar.gz) = fd744146e81f90850af1cd22be0ccca2364d8e5bf73d823519dabe9658e22e91
-SIZE (golang-net-7b1cca2_GH0.tar.gz) = 1177480
+SHA256 (golang-crypto-a769d52b0f97_GH0.tar.gz) = d93f7b5b85901b88518c3997c20ac1aff1d60ecb127a0427e87da87cc7d593a1
+SIZE (golang-crypto-a769d52b0f97_GH0.tar.gz) = 1731973
+SHA256 (golang-net-e18ecbb05110_GH0.tar.gz) = c30374f6fd34c6b77d53224aa3ba7458e3773d7e6e4fa16d88fb05c7d05e0e89
+SIZE (golang-net-e18ecbb05110_GH0.tar.gz) = 1253124
+SHA256 (golang-sys-665e8c7367d1_GH0.tar.gz) = 19c3498496d91ac9c0c0226c9b832c23a0b042b9a707be811ef976e801d373f4
+SIZE (golang-sys-665e8c7367d1_GH0.tar.gz) = 1200405
 SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
 SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332
-SHA256 (golang-sys-b09fb70_GH0.tar.gz) = 0e05090ac2dcacf63d43dc00c6148c3b3dd41918efd318bc7082ea52d47b4624
-SIZE (golang-sys-b09fb70_GH0.tar.gz) = 1068311
 SHA256 (torbsd-goptlib-v1.1.0_GH0.tar.gz) = ff908e532019a0d16adc8505214d8e6f49ffaf5b7bf2dcecfb9ca61307d001f0
 SIZE (torbsd-goptlib-v1.1.0_GH0.tar.gz) = 29395
-SHA256 (Yawning-bsaes-26d1add_GH0.tar.gz) = a6eb5058cc68909cd1bacfc6345ea958187481ef85ef8a30887d4eea7c6eb6af
-SIZE (Yawning-bsaes-26d1add_GH0.tar.gz) = 18853
-SHA256 (yawning-utls-ad258eb64575fd468dbd2f93ef229df5f7fe72b4_GL0.tar.gz) = 9e2d08350387048d1833cefa69567cb3b0137fff3befaa66efa2fad48f99553e
-SIZE (yawning-utls-ad258eb64575fd468dbd2f93ef229df5f7fe72b4_GL0.tar.gz) = 560538
+SHA256 (yawning-obfs4-a564bc3840bc788605e1a8155f4b95ce0d70c6db_GL0.tar.gz) = 4e0e3c59c33cff7028d4b989c2c423461babce91c11030a69195a608d4dfc36e
+SIZE (yawning-obfs4-a564bc3840bc788605e1a8155f4b95ce0d70c6db_GL0.tar.gz) = 91230
+SHA256 (yawning-bsaes-0a714cd429ec754482b4001e918db30cd2094405_GL0.tar.gz) = 6cf841b466d554afa7a0f8cea516ac0e2c017c045af5315c0fe0331395f49631
+SIZE (yawning-bsaes-0a714cd429ec754482b4001e918db30cd2094405_GL0.tar.gz) = 18759
+SHA256 (yawning-edwards25519-extra-2f91fcc9fbdb888f3c795849b6777940135559b7_GL0.tar.gz) = 3cff3ca823b980102f235250addb11d33f71659370bd92b08dc6e2958d6c430b
+SIZE (yawning-edwards25519-extra-2f91fcc9fbdb888f3c795849b6777940135559b7_GL0.tar.gz) = 37038
+SHA256 (yawning-utls-f1bcf4b40e4596d0ccd1dbf8f3a9f4922f9759ca_GL0.tar.gz) = 73e937e4f256f6ba730b1d3771e377fbe0761c481e1429fda645f5174dad0d14
+SIZE (yawning-utls-f1bcf4b40e4596d0ccd1dbf8f3a9f4922f9759ca_GL0.tar.gz) = 562805