diff --git a/www/s/Makefile b/www/s/Makefile
index 21afd8aec73d..0ba1f7d73fcc 100644
--- a/www/s/Makefile
+++ b/www/s/Makefile
@@ -1,29 +1,18 @@
 PORTNAME=	s
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.16
+DISTVERSION=	0.6.0
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Web search in a terminal
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	zquestz
-GH_TUPLE=	\
-		NYTimes:gziphandler:v1.1.1:nytimes_gziphandler/vendor/github.com/NYTimes/gziphandler \
-		golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
-		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
-		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
-		spf13:cobra:v1.2.1:spf13_cobra/vendor/github.com/spf13/cobra \
-		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
-		zquestz:go-ucl:ec59c7af0062:zquestz_go_ucl/vendor/github.com/zquestz/go-ucl
-
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+GO_MODULE=	github.com/zquestz/s
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/s/distinfo b/www/s/distinfo
index 291ecad39e55..8f0451d7d65d 100644
--- a/www/s/distinfo
+++ b/www/s/distinfo
@@ -1,17 +1,5 @@
-TIMESTAMP = 1627791696
-SHA256 (zquestz-s-v0.5.16_GH0.tar.gz) = 08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
-SIZE (zquestz-s-v0.5.16_GH0.tar.gz) = 67119
-SHA256 (NYTimes-gziphandler-v1.1.1_GH0.tar.gz) = c236c216a16e4286338e66e0947938944992f918fe827c31f8745c0be98818d2
-SIZE (NYTimes-gziphandler-v1.1.1_GH0.tar.gz) = 52107
-SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
-SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095
-SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
-SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
-SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
-SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362
-SHA256 (spf13-cobra-v1.2.1_GH0.tar.gz) = 382d414ff7b8f421ae07d32d5a17161718b45bdd00de86dc107a34e639857794
-SIZE (spf13-cobra-v1.2.1_GH0.tar.gz) = 161312
-SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
-SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
-SHA256 (zquestz-go-ucl-ec59c7af0062_GH0.tar.gz) = 62e0dffd805b0f605cd01cea285b0490987959471193fae254f24cdddab0a0e1
-SIZE (zquestz-go-ucl-ec59c7af0062_GH0.tar.gz) = 9724
+TIMESTAMP = 1634575904
+SHA256 (go/www_s/s-v0.6.0/v0.6.0.mod) = 8441d70471d27db394dcaab69e44136045e325bc0fe919bd316ce7a07d8f60c8
+SIZE (go/www_s/s-v0.6.0/v0.6.0.mod) = 248
+SHA256 (go/www_s/s-v0.6.0/v0.6.0.zip) = ec7187170fecdba7849c7487f109e49b38c43e6c0c6da7c343b626f91072937a
+SIZE (go/www_s/s-v0.6.0/v0.6.0.zip) = 118556