diff --git a/sysutils/checkbashisms/Makefile b/sysutils/checkbashisms/Makefile
index 7138a1224a0..ee299a56374 100644
--- a/sysutils/checkbashisms/Makefile
+++ b/sysutils/checkbashisms/Makefile
@@ -1,10 +1,10 @@
 COMMENT=		check shell scripts for bash-specific constructs
 
-V=			2.24.8
+V=			2.25.18
 DISTNAME=		devscripts_$V
 PKGNAME=		checkbashisms-$V
 EXTRACT_SUFX=		.tar.xz
-WRKDIST=		${WRKDIR}/devscripts
+WRKDIST=		${WRKDIR}/work/scripts
 CATEGORIES=		sysutils devel
 
 # GPLv2 only
@@ -17,8 +17,12 @@ NO_TEST=		Yes
 PKG_ARCH=		*
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/checkbashisms.pl \
+	sed -i "s/###VERSION###/${V}/g" ${WRKSRC}/checkbashisms.pl
+	${INSTALL_SCRIPT} ${WRKSRC}/checkbashisms.pl \
 		${PREFIX}/bin/checkbashisms
-	${INSTALL_MAN} ${WRKSRC}/scripts/checkbashisms.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/checkbashisms.1 ${PREFIX}/man/man1
+	${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions/
+	${INSTALL_DATA} ${WRKSRC}/checkbashisms.bash_completion \
+		${PREFIX}/share/bash-completion/completions/checkbashisms
 
 .include <bsd.port.mk>
diff --git a/sysutils/checkbashisms/distinfo b/sysutils/checkbashisms/distinfo
index 6320e22b6e6..78067952593 100644
--- a/sysutils/checkbashisms/distinfo
+++ b/sysutils/checkbashisms/distinfo
@@ -1,2 +1,2 @@
-SHA256 (devscripts_2.24.8.tar.xz) = ElFSdsQZ24cMKGdFk4JbgS627waNxkrX+nqdn7d4/qQ=
-SIZE (devscripts_2.24.8.tar.xz) = 1022256
+SHA256 (devscripts_2.25.18.tar.xz) = TxfETvb5209ZAFHTssn/yB2Ps3mrF8pDepDAP+XZ4B0=
+SIZE (devscripts_2.25.18.tar.xz) = 1081196
diff --git a/sysutils/checkbashisms/pkg/PLIST b/sysutils/checkbashisms/pkg/PLIST
index 8fa5bdcf0e8..7fdaf234425 100644
--- a/sysutils/checkbashisms/pkg/PLIST
+++ b/sysutils/checkbashisms/pkg/PLIST
@@ -1,2 +1,5 @@
 bin/checkbashisms
 @man man/man1/checkbashisms.1
+share/bash-completion/
+share/bash-completion/completions/
+share/bash-completion/completions/checkbashisms