diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 195fc1eb9cd..05b801ea5a5 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,8 @@
 # Template file for 's'
 pkgname=s
-version=0.5.16
+version=0.6.0
 revision=1
+build_helper=qemu
 build_style=go
 go_import_path=github.com/zquestz/s
 hostmakedepends="git"
@@ -10,9 +11,18 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=08b7082ff900c7ec61905d954b7025dc6f780c23c81f2f13e200b2bbd7a2ef9c
+checksum=0019e21dba7bb30e4de279b71e027c7d78f3236d709c2fe5be39b38d22aa7097
+
+post_build() {
+	s_cli=$(find $GOPATH/bin -name s)
+	vtargetrun $s_cli --completion bash >s.bash
+	vtargetrun $s_cli --completion fish >s.fish
+	vtargetrun $s_cli --completion zsh >s.zsh
+}
 
 post_install() {
 	vlicense LICENSE
-	vinstall autocomplete/s.fish 644 usr/share/fish/vendor_completions.d
+	vcompletion s.bash bash
+	vcompletion s.fish fish
+	vcompletion s.zsh zsh
 }