diff --git a/sysutils/tarsnap/Makefile b/sysutils/tarsnap/Makefile
index 6ba27e64bd32..954467dffbf9 100644
--- a/sysutils/tarsnap/Makefile
+++ b/sysutils/tarsnap/Makefile
@@ -1,35 +1,37 @@
 # Created by: Colin Percival
 
 PORTNAME=	tarsnap
 PORTVERSION=	1.0.40
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.tarsnap.com/download-http/
 DISTNAME=	${PORTNAME}-autoconf-${PORTVERSION}
 
 MAINTAINER=	cperciva@tarsnap.com
 COMMENT=	Online encrypted backup service (client)
 
 LICENSE=	tarsnap
 LICENSE_NAME=	tarsnap
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="-I${OPENSSLINC} ${CFLAGS}" \
 		LDFLAGS="-L${OPENSSLLIB} ${LDFLAGS}"
-CONFIGURE_ARGS=	--with-bash-completion-dir=${PREFIX}/etc/bash_completion.d/
+CONFIGURE_ARGS=	--with-bash-completion-dir=${PREFIX}/etc/bash_completion.d/	\
+		--with-zsh-completion-dir=${PREFIX}/share/zsh/site-functions
 
 USES=		gmake tar:tgz ssl
 
 .include <bsd.port.pre.mk>
 
 # safety check to ensure that we don't violate the license
 .if exists(${PATCHDIR})
 # Converted from RESTRICTED
 LICENSE_TEXT=	license only allows redistribution and use of unmodified source and binaries
 LICENSE_PERMS=	auto-accept
 .else
 # Converted from LEGAL_TEXT
 LICENSE_TEXT=	license restricts redistribution of source and binaries
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/tarsnap/pkg-plist b/sysutils/tarsnap/pkg-plist
index 4b045f11a23c..91db16919519 100644
--- a/sysutils/tarsnap/pkg-plist
+++ b/sysutils/tarsnap/pkg-plist
@@ -1,17 +1,18 @@
 bin/tarsnap
 bin/tarsnap-keygen
 bin/tarsnap-keymgmt
 bin/tarsnap-keyregen
 bin/tarsnap-recrypt
 etc/bash_completion.d/tarsnap
 etc/bash_completion.d/tarsnap-keygen
 etc/bash_completion.d/tarsnap-keymgmt
 etc/bash_completion.d/tarsnap-keyregen
 etc/bash_completion.d/tarsnap-recrypt
 man/man1/tarsnap-keygen.1.gz
 man/man1/tarsnap-keymgmt.1.gz
 man/man1/tarsnap-keyregen.1.gz
 man/man1/tarsnap-recrypt.1.gz
 man/man1/tarsnap.1.gz
 man/man5/tarsnap.conf.5.gz
+share/zsh/site-functions/_tarsnap
 @sample etc/tarsnap.conf.sample