Index: head/sysutils/restic/Makefile
===================================================================
--- head/sysutils/restic/Makefile
+++ head/sysutils/restic/Makefile
@@ -1,28 +1,38 @@
 # $FreeBSD$
 
 PORTNAME=	restic
-PORTVERSION=	0.7.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+DISTVERSION=	0.8.1
 CATEGORIES=	sysutils
 
-MAINTAINER=	wg@FreeBSD.org
-COMMENT=	Restic backup program
+MAINTAINER=	gregf@hugops.pw
+COMMENT=	Fast, secure, efficient backup program
 
 LICENSE=	BSD2CLAUSE
 
 USES=		go
 USE_GITHUB=	yes
 
-PLIST_FILES=	bin/restic
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+GO_TARGET=	${GO_PKGNAME}/cmd/${PORTNAME}
 
-post-patch:
-	@${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" ${WRKSRC}/src/cmds/restic/cmd_autocomplete.go
+OPTIONS_SUB=	yes
+PLIST_SUB=	PORTNAME=${PORTNAME}
 
-do-build:
-	@(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} run build.go)
+OPTIONS_DEFINE=		BASH ZSH
+OPTIONS_DEFAULT=	BASH ZSH
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/doc/man/* ${STAGEDIR}${MANPREFIX}/man/man1
+
+post-install-BASH-on:
+	${INSTALL} -d ${STAGEDIR}${PREFIX}/etc/bash_completion.d/
+	${INSTALL_SCRIPT} ${WRKSRC}/doc/bash-completion.sh \
+		${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME}.sh
+
+post-install-ZSH-on:
+	${INSTALL} -d ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
+	${INSTALL_DATA} ${WRKSRC}/doc/zsh-completion.zsh \
+		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME}
 
 .include <bsd.port.mk>
Index: head/sysutils/restic/distinfo
===================================================================
--- head/sysutils/restic/distinfo
+++ head/sysutils/restic/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500737632
-SHA256 (restic-restic-v0.7.1_GH0.tar.gz) = 81efde662c34225b5705f3d72daa1f6278455c2b8f786224d7a1ecca0b14efca
-SIZE (restic-restic-v0.7.1_GH0.tar.gz) = 25438170
+TIMESTAMP = 1514775412
+SHA256 (restic-restic-v0.8.1_GH0.tar.gz) = 1e0e0d1e7388beaa2a892c057759fdfe6a4fe915f9518c73068761f8d6d7619d
+SIZE (restic-restic-v0.8.1_GH0.tar.gz) = 40330154
Index: head/sysutils/restic/files/patch-src_cmds_restic_cmd__autocomplete.go
===================================================================
--- head/sysutils/restic/files/patch-src_cmds_restic_cmd__autocomplete.go
+++ head/sysutils/restic/files/patch-src_cmds_restic_cmd__autocomplete.go
@@ -1,11 +0,0 @@
---- src/cmds/restic/cmd_autocomplete.go.orig	2017-07-27 13:03:30 UTC
-+++ src/cmds/restic/cmd_autocomplete.go
-@@ -30,7 +30,7 @@ $ sudo restic autocomplete`,
- func init() {
- 	cmdRoot.AddCommand(cmdAutocomplete)
- 
--	cmdAutocomplete.Flags().StringVarP(&autocompleteTarget, "completionfile", "", "/etc/bash_completion.d/restic.sh", "autocompletion file")
-+	cmdAutocomplete.Flags().StringVarP(&autocompleteTarget, "completionfile", "", "%%PREFIX%%/etc/bash_completion.d/restic.sh", "autocompletion file")
- 	// For bash-completion
- 	cmdAutocomplete.Flags().SetAnnotation("completionfile", cobra.BashCompFilenameExt, []string{})
- }
Index: head/sysutils/restic/pkg-plist
===================================================================
--- head/sysutils/restic/pkg-plist
+++ head/sysutils/restic/pkg-plist
@@ -0,0 +1,25 @@
+bin/restic
+%%BASH%%etc/bash_completion.d/%%PORTNAME%%.sh
+%%ZSH%%share/zsh/site-functions/_%%PORTNAME%%
+man/man1/%%PORTNAME%%-backup.1.gz
+man/man1/%%PORTNAME%%-cat.1.gz
+man/man1/%%PORTNAME%%-check.1.gz
+man/man1/%%PORTNAME%%-diff.1.gz
+man/man1/%%PORTNAME%%-dump.1.gz
+man/man1/%%PORTNAME%%-find.1.gz
+man/man1/%%PORTNAME%%-forget.1.gz
+man/man1/%%PORTNAME%%-generate.1.gz
+man/man1/%%PORTNAME%%-init.1.gz
+man/man1/%%PORTNAME%%-key.1.gz
+man/man1/%%PORTNAME%%-list.1.gz
+man/man1/%%PORTNAME%%-ls.1.gz
+man/man1/%%PORTNAME%%-migrate.1.gz
+man/man1/%%PORTNAME%%-mount.1.gz
+man/man1/%%PORTNAME%%-prune.1.gz
+man/man1/%%PORTNAME%%-rebuild-index.1.gz
+man/man1/%%PORTNAME%%-restore.1.gz
+man/man1/%%PORTNAME%%-snapshots.1.gz
+man/man1/%%PORTNAME%%-tag.1.gz
+man/man1/%%PORTNAME%%-unlock.1.gz
+man/man1/%%PORTNAME%%-version.1.gz
+man/man1/%%PORTNAME%%.1.gz