diff --git a/devel/awless/Makefile b/devel/awless/Makefile
index ee67fc5fbe49..b4de5a3d716c 100644
--- a/devel/awless/Makefile
+++ b/devel/awless/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	awless
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.11
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	devel
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Fast, powerful and easy-to-use CLI for AWS
 WWW=		https://github.com/wallix/awless
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wallix
 GH_SUBDIR=	src/github.com/wallix/${PORTNAME}
-GH_TUPLE=	golang:sys:33540a1f6037:golang_sys
+GH_TUPLE=	golang:sys:v0.6.0:golang_sys
 
 PLIST_FILES=	bin/awless
 PORTDOCS=	README.md CHANGELOG.md
 
 OPTIONS_DEFINE=	DOCS
 
 # freebsd/arm64 needs golang.org/x/sys@33540a1f6037 or later
 post-patch:
 	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
 	${RLN} ${WRKSRC_golang_sys} ${WRKSRC}/vendor/golang.org/x/sys
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/awless/distinfo b/devel/awless/distinfo
index c0c00ac70423..04c942fc4a6d 100644
--- a/devel/awless/distinfo
+++ b/devel/awless/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1581935565
+TIMESTAMP = 1680114704
 SHA256 (wallix-awless-v0.1.11_GH0.tar.gz) = 1a78636face8753cb983a5e4c1e3bfc9e1940e7eb932aa01fe2cbded46fd4292
 SIZE (wallix-awless-v0.1.11_GH0.tar.gz) = 11725608
-SHA256 (golang-sys-33540a1f6037_GH0.tar.gz) = 09ebdf007413c2eaddce123137443d08d1848be410c58896e772f0481ec385d5
-SIZE (golang-sys-33540a1f6037_GH0.tar.gz) = 1497659
+SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234
diff --git a/devel/awless/files/patch-vendor_github.com_boltdb_bolt_bolt__riscv64.go b/devel/awless/files/patch-vendor_github.com_boltdb_bolt_bolt__riscv64.go
new file mode 100644
index 000000000000..8b11be4f4104
--- /dev/null
+++ b/devel/awless/files/patch-vendor_github.com_boltdb_bolt_bolt__riscv64.go
@@ -0,0 +1,16 @@
+--- /dev/null	2023-03-29 16:51:35 UTC
++++ vendor/github.com/boltdb/bolt/bolt_riscv64.go
+@@ -0,0 +1,13 @@
++//go:build riscv64
++// +build riscv64
++
++package bolt
++
++// maxMapSize represents the largest mmap size supported by Bolt.
++const maxMapSize = 0xFFFFFFFFFFFF // 256TB
++
++// maxAllocSize is the size used when creating array pointers.
++const maxAllocSize = 0x7FFFFFFF
++
++// are unaligned reads/writes not supported?
++var brokenUnaligned = false