diff --git a/net-im/gotosocial/Makefile b/net-im/gotosocial/Makefile
index 0f6df006a241..43eb60372d9f 100644
--- a/net-im/gotosocial/Makefile
+++ b/net-im/gotosocial/Makefile
@@ -1,54 +1,51 @@
 PORTNAME=	gotosocial
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.0
-PORTREVISION=	2
+DISTVERSION=	0.7.0
 CATEGORIES=	net-im
 MASTER_SITES?=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${DISTVERSION}/:web
 DISTFILES?=	${PORTNAME}_${DISTVERSION}_web-assets.tar.gz:web
 
 MAINTAINER=	freebsd@igalic.co
 COMMENT=	Golang fediverse server
 WWW=		https://docs.gotosocial.org/en/latest/
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-ONLY_FOR_ARCHS=	amd64
-
-# Note: we don't use go:modules, because this project vendors all deps
-USES=		go
-USE_RC_SUBR=	${PORTNAME}
+ONLY_FOR_ARCHS=	aarch64 amd64 armv7 i386
+ONLY_FOR_ARCHS_REASON=	https://gitlab.com/cznic/libc/-/issues/15
 
+USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	superseriousbusiness
+USE_RC_SUBR=	${PORTNAME}
+
+GO_TARGET=	./cmd/gotosocial
+GO_BUILDFLAGS=	-trimpath -tags "netgo osusergo static_build kvformat ${WITH_DEBUG:Ddebugenv}" \
+	-ldflags="${STRIP} -w -extldflags '-static' -X 'main.Version=${PKGVERSION}'"
+CGO_ENABLED=	0
 
 SUB_LIST=	DBDIR="${DBDIR}" \
 		GROUP="${GROUPS}" \
 		USER="${USERS}" \
 		WWWDIR="${WWWDIR}"
 
 USERS=		gotosocial
 GROUPS=		gotosocial
 
 DBDIR=		/var/db/${PORTNAME}
 
 PLIST_SUB=	WWWDIR="${WWWDIR}"
 
-do-build:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		VERSION=${DISTVERSION} COMMIT=${GH_TAGNAME} scripts/build.sh )
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \
-		${STAGEDIR}${PREFIX}/bin/
+post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in LICENSE README.md
 	${INSTALL_DATA} ${WRKSRC}/${x} \
 		${STAGEDIR}${DOCSDIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/example/config.yaml \
 		${STAGEDIR}${ETCDIR}/config.yaml.sample
 	(cd ${WRKSRC}/../web && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/ )
 
 .include <bsd.port.mk>
diff --git a/net-im/gotosocial/distinfo b/net-im/gotosocial/distinfo
index 09fc3f5b6749..6cd30495f32b 100644
--- a/net-im/gotosocial/distinfo
+++ b/net-im/gotosocial/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1670334530
-SHA256 (gotosocial_0.6.0_web-assets.tar.gz) = 4407c90e2d464778037f2493069cf2b60871f2ee6eba40b5096a748e8cb74e9f
-SIZE (gotosocial_0.6.0_web-assets.tar.gz) = 1630400
-SHA256 (superseriousbusiness-gotosocial-v0.6.0_GH0.tar.gz) = a0dedaf73015f739c6bbe8d9cc7cf0b16b3132b2586ef9b44faf80b6849b3ac1
-SIZE (superseriousbusiness-gotosocial-v0.6.0_GH0.tar.gz) = 43666836
+TIMESTAMP = 1676654810
+SHA256 (gotosocial_0.7.0_web-assets.tar.gz) = bff859922ce38c79fe121d9a2aa83683d3c5d2f08ca1bcf4adad8524e305b918
+SIZE (gotosocial_0.7.0_web-assets.tar.gz) = 1314007
+SHA256 (superseriousbusiness-gotosocial-v0.7.0_GH0.tar.gz) = b0a97517f8a61387be165f880430fe28e5ca592e865207c03b798aec3f424517
+SIZE (superseriousbusiness-gotosocial-v0.7.0_GH0.tar.gz) = 51866249
diff --git a/net-im/gotosocial/pkg-plist b/net-im/gotosocial/pkg-plist
index 83fddf0f6687..24caf31deb8d 100644
--- a/net-im/gotosocial/pkg-plist
+++ b/net-im/gotosocial/pkg-plist
@@ -1,55 +1,60 @@
 @sample etc/gotosocial/config.yaml.sample
 %%WWWDIR%%/template/header.tmpl
 %%WWWDIR%%/template/thread.tmpl
 %%WWWDIR%%/template/frontend.tmpl
 %%WWWDIR%%/template/oob.tmpl
 %%WWWDIR%%/template/confirmed.tmpl
 %%WWWDIR%%/template/profile.tmpl
 %%WWWDIR%%/template/status.tmpl
 %%WWWDIR%%/template/email_confirm_html.tmpl
 %%WWWDIR%%/template/footer.tmpl
 %%WWWDIR%%/template/email_reset_html.tmpl
 %%WWWDIR%%/template/sign-in.tmpl
 %%WWWDIR%%/template/email_reset_text.tmpl
 %%WWWDIR%%/template/email_confirm_text.tmpl
 %%WWWDIR%%/template/index.tmpl
 %%WWWDIR%%/template/404.tmpl
 %%WWWDIR%%/template/error.tmpl
 %%WWWDIR%%/template/authorize.tmpl
-%%WWWDIR%%/assets/NotoSans-Regular.ttf
+%%WWWDIR%%/template/domain-blocklist.tmpl
+%%WWWDIR%%/template/finalize.tmpl
 %%WWWDIR%%/assets/default_avatars/GoToSocial_icon5.png
 %%WWWDIR%%/assets/default_avatars/GoToSocial_icon2.png
 %%WWWDIR%%/assets/default_avatars/GoToSocial_icon3.png
 %%WWWDIR%%/assets/default_avatars/GoToSocial_icon4.png
 %%WWWDIR%%/assets/default_avatars/GoToSocial_icon1.png
 %%WWWDIR%%/assets/default_avatars/GoToSocial_icon6.png
 %%WWWDIR%%/assets/mastodon.svg
-%%WWWDIR%%/assets/OFL.txt
-%%WWWDIR%%/assets/NotoSans-Bold.ttf
+%%WWWDIR%%/assets/logo.svg
 %%WWWDIR%%/assets/default_header.png
+%%WWWDIR%%/assets/fonts/OFL.txt
+%%WWWDIR%%/assets/fonts/noto-sans-v27-latin-700.woff
+%%WWWDIR%%/assets/fonts/noto-sans-v27-latin-700.woff2
+%%WWWDIR%%/assets/fonts/noto-sans-v27-latin-regular.woff
+%%WWWDIR%%/assets/fonts/noto-sans-v27-latin-regular.woff2
 %%WWWDIR%%/assets/Fork-Awesome/CONTRIBUTORS.md
 %%WWWDIR%%/assets/Fork-Awesome/fonts/forkawesome-webfont.ttf
 %%WWWDIR%%/assets/Fork-Awesome/fonts/forkawesome-webfont.woff2
 %%WWWDIR%%/assets/Fork-Awesome/fonts/forkawesome-webfont.eot
 %%WWWDIR%%/assets/Fork-Awesome/fonts/forkawesome-webfont.svg
 %%WWWDIR%%/assets/Fork-Awesome/fonts/forkawesome-webfont.woff
 %%WWWDIR%%/assets/Fork-Awesome/LICENSES
 %%WWWDIR%%/assets/Fork-Awesome/css/fork-awesome.min.css.map
 %%WWWDIR%%/assets/Fork-Awesome/css/v5-compat.min.css
 %%WWWDIR%%/assets/Fork-Awesome/css/v5-compat.css
 %%WWWDIR%%/assets/Fork-Awesome/css/fork-awesome.css
 %%WWWDIR%%/assets/Fork-Awesome/css/v5-compat.min.css.map
 %%WWWDIR%%/assets/Fork-Awesome/css/fork-awesome.min.css
 %%WWWDIR%%/assets/tusky.svg
 %%WWWDIR%%/assets/logo.png
 %%WWWDIR%%/assets/dist/profile.css
 %%WWWDIR%%/assets/dist/_colors.css
 %%WWWDIR%%/assets/dist/settings.js
 %%WWWDIR%%/assets/dist/status.css
 %%WWWDIR%%/assets/dist/settings-style.css
 %%WWWDIR%%/assets/dist/base.css
 %%WWWDIR%%/assets/dist/frontend.js
 %%WWWDIR%%/assets/swagger.yaml
 bin/gotosocial
 share/doc/gotosocial/LICENSE
 share/doc/gotosocial/README.md