diff --git a/sysutils/tarsnap/Makefile b/sysutils/tarsnap/Makefile
index 044b08948e7e..6ba27e64bd32 100644
--- a/sysutils/tarsnap/Makefile
+++ b/sysutils/tarsnap/Makefile
@@ -1,34 +1,35 @@
 # Created by: Colin Percival
 
 PORTNAME=	tarsnap
-PORTVERSION=	1.0.39
+PORTVERSION=	1.0.40
 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/
 
 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/distinfo b/sysutils/tarsnap/distinfo
index a9583db1303d..dd8800ce62b0 100644
--- a/sysutils/tarsnap/distinfo
+++ b/sysutils/tarsnap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501300591
-SHA256 (tarsnap-autoconf-1.0.39.tgz) = 5613218b2a1060c730b6c4a14c2b34ce33898dd19b38fb9ea0858c5517e42082
-SIZE (tarsnap-autoconf-1.0.39.tgz) = 641089
+TIMESTAMP = 1644690645
+SHA256 (tarsnap-autoconf-1.0.40.tgz) = bccae5380c1c1d6be25dccfb7c2eaa8364ba3401aafaee61e3c5574203c27fd5
+SIZE (tarsnap-autoconf-1.0.40.tgz) = 723380
diff --git a/sysutils/tarsnap/pkg-plist b/sysutils/tarsnap/pkg-plist
index 7904fa31669e..4b045f11a23c 100644
--- a/sysutils/tarsnap/pkg-plist
+++ b/sysutils/tarsnap/pkg-plist
@@ -1,12 +1,17 @@
 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
 @sample etc/tarsnap.conf.sample