diff --git a/net-im/signal-cli/Makefile b/net-im/signal-cli/Makefile
index 19c54514a510..b8b15cfa0c4e 100644
--- a/net-im/signal-cli/Makefile
+++ b/net-im/signal-cli/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	signal-cli
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.4.1
+DISTVERSION=	0.8.5
 CATEGORIES=	net-im java
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/${DISTVERSIONFULL}/:jars
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:jars
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Command-line and D-Bus interface for Signal and libsignal-service-java
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 EXTRACT_DEPENDS=	zip:archivers/zip
 BUILD_DEPENDS=		asciidoc>0:textproc/asciidoc
 LIB_DEPENDS=		libsignal_jni.so:net-im/libsignal-client \
 			libzkgroup.so:net-im/zkgroup
 RUN_DEPENDS=		libsignal-client>=0.8.1:net-im/libsignal-client
 
 USES=		gmake shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	AsamK
 USE_JAVA=	yes
 JAVA_VERSION=	11+
 JAVA_RUN=	jre
 USE_RC_SUBR=	signal_cli
 SHEBANG_FILES=	bin/${PORTNAME}
 SHEBANG_LANG=	sh
 sh_CMD=		/bin/sh
 
 NO_ARCH=	yes
 
 SUB_FILES=	${PORTNAME} pkg-message
 SUB_LIST=	JAVA_HOME="${JAVA_HOME}"
 
 BUILD_WRKSRC=	${WRKSRC}/man
 
 USERS=		signal-cli
 GROUPS=		signal-cli
 
 PLIST_SUB=	VERSION=${DISTVERSION}
 
 OPTIONS_DEFINE=		DBUS
 OPTIONS_DEFAULT=	DBUS
 
 DBUS_RUN_DEPENDS=	dbus>0:devel/dbus
 DBUS_PLIST_FILES=	etc/dbus-1/system.d/org.asamk.Signal.conf \
 			share/dbus-1/services/org.asamk.Signal.service
 
 post-extract:
 # Delete bundled libraries from the JARs. Otherwise, they are going to conflict
 # with the libraries installed by net-im/zkgroup and net-im/libsignal-client.
 	zip -d ${WRKSRC}/lib/zkgroup-java-*.jar libzkgroup.so
 	zip -d ${WRKSRC}/lib/signal-client-java-*.jar libsignal_jni.so
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} \
 		${STAGEDIR}${DATADIR}/bin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/*.jar \
 		${STAGEDIR}${DATADIR}/lib/
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/man/signal-cli.1 \
 		${STAGEDIR}${MAN1PREFIX}/share/man/man1
 
 post-install-DBUS-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/services
 	${INSTALL_DATA} ${WRKSRC}/data/org.asamk.Signal.service \
 		${STAGEDIR}${PREFIX}/share/dbus-1/services
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d
 	${INSTALL_DATA} ${WRKSRC}/data/org.asamk.Signal.conf \
 		${STAGEDIR}${PREFIX}/etc/dbus-1/system.d
 
 .include <bsd.port.mk>
diff --git a/net-im/signal-cli/distinfo b/net-im/signal-cli/distinfo
index 354f779e4443..ab8bc148ef9f 100644
--- a/net-im/signal-cli/distinfo
+++ b/net-im/signal-cli/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1624268783
-SHA256 (signal-cli-0.8.4.1.tar.gz) = f1286d0b7a759f0bc86496d87f5cb24bb9a208eb8383d0f33815452bb5a331d6
-SIZE (signal-cli-0.8.4.1.tar.gz) = 17756732
-SHA256 (AsamK-signal-cli-v0.8.4.1_GH0.tar.gz) = 0b7a2ee5564a66a9a1d1c65f5df0ffc28cecc8e6a50836543116a78c1cfd4856
-SIZE (AsamK-signal-cli-v0.8.4.1_GH0.tar.gz) = 211997
+TIMESTAMP = 1628333804
+SHA256 (signal-cli-0.8.5.tar.gz) = 1fcf797f223a7ddaebaa172028cc73192c4ee4116eba2ce37e3044c2f975cb28
+SIZE (signal-cli-0.8.5.tar.gz) = 17563403
+SHA256 (AsamK-signal-cli-v0.8.5_GH0.tar.gz) = f9f678ef4a38c33c983e32362daffdf46989af3f7ce6267072eaf0e4130b7e03
+SIZE (AsamK-signal-cli-v0.8.5_GH0.tar.gz) = 212243
diff --git a/net-im/signal-cli/pkg-plist b/net-im/signal-cli/pkg-plist
index 76a669a41753..a1b78b3a2da5 100644
--- a/net-im/signal-cli/pkg-plist
+++ b/net-im/signal-cli/pkg-plist
@@ -1,38 +1,38 @@
 bin/signal-cli
 share/man/man1/signal-cli.1.gz
 %%DATADIR%%/bin/signal-cli
 %%DATADIR%%/lib/annotations-13.0.jar
 %%DATADIR%%/lib/argparse4j-0.9.0.jar
 %%DATADIR%%/lib/asm-9.0.jar
 %%DATADIR%%/lib/asm-analysis-9.0.jar
 %%DATADIR%%/lib/asm-commons-9.0.jar
 %%DATADIR%%/lib/asm-tree-9.0.jar
 %%DATADIR%%/lib/asm-util-9.0.jar
-%%DATADIR%%/lib/bcprov-jdk15on-1.68.jar
+%%DATADIR%%/lib/bcprov-jdk15on-1.69.jar
 %%DATADIR%%/lib/dbus-java-3.3.0.jar
 %%DATADIR%%/lib/jackson-annotations-2.9.0.jar
 %%DATADIR%%/lib/jackson-core-2.9.9.jar
 %%DATADIR%%/lib/jackson-databind-2.9.9.2.jar
 %%DATADIR%%/lib/jffi-1.3.1-native.jar
 %%DATADIR%%/lib/jffi-1.3.1.jar
 %%DATADIR%%/lib/jnr-a64asm-1.0.0.jar
 %%DATADIR%%/lib/jnr-constants-0.10.1.jar
 %%DATADIR%%/lib/jnr-enxio-0.32.3.jar
 %%DATADIR%%/lib/jnr-ffi-2.2.1.jar
 %%DATADIR%%/lib/jnr-posix-3.1.4.jar
 %%DATADIR%%/lib/jnr-unixsocket-0.38.5.jar
 %%DATADIR%%/lib/jnr-x86asm-1.0.2.jar
 %%DATADIR%%/lib/kotlin-stdlib-1.3.71.jar
 %%DATADIR%%/lib/kotlin-stdlib-common-1.3.71.jar
 %%DATADIR%%/lib/lib.jar
 %%DATADIR%%/lib/libphonenumber-8.12.17.jar
 %%DATADIR%%/lib/okhttp-4.6.0.jar
 %%DATADIR%%/lib/okio-jvm-2.6.0.jar
 %%DATADIR%%/lib/protobuf-javalite-3.10.0.jar
 %%DATADIR%%/lib/signal-cli-%%VERSION%%.jar
 %%DATADIR%%/lib/signal-client-java-0.8.1.jar
 %%DATADIR%%/lib/signal-service-java-2.15.3_unofficial_24.jar
 %%DATADIR%%/lib/slf4j-api-1.7.30.jar
 %%DATADIR%%/lib/slf4j-simple-1.7.30.jar
 %%DATADIR%%/lib/threetenbp-1.3.6.jar
 %%DATADIR%%/lib/zkgroup-java-0.7.0.jar