diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile
index b9b09b728900..7d804479ecf5 100644
--- a/net/openconnect/Makefile
+++ b/net/openconnect/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2019/05/20 14:16:21 schmonz Exp $
+# $NetBSD: Makefile,v 1.11 2019/09/07 19:30:21 schmonz Exp $
 
-DISTNAME=	openconnect-8.03
+DISTNAME=	openconnect-8.04
 CATEGORIES=	net security
 MASTER_SITES=	ftp://ftp.infradead.org/pub/openconnect/
 
@@ -20,8 +20,7 @@ CONFIGURE_ARGS+=	--with-vpnc-script=${PKG_SYSCONFDIR}/vpnc-script
 CONFIGURE_ARGS+=	--disable-nls
 
 REPLACE_PYTHON=		trojans/tncc-wrapper.py
-REPLACE_BASH=		trojans/csd-post.sh
-REPLACE_BASH+=		trojans/csd-wrapper.sh
+REPLACE_BASH=		trojans/*.sh
 
 PYTHON_VERSIONS_ACCEPTED=27
 
diff --git a/net/openconnect/PLIST b/net/openconnect/PLIST
index 5cf63db0b014..8b6e3483261b 100644
--- a/net/openconnect/PLIST
+++ b/net/openconnect/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2019/01/07 22:23:52 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/09/07 19:30:21 schmonz Exp $
 include/openconnect.h
 lib/libopenconnect.la
 lib/pkgconfig/openconnect.pc
 libexec/openconnect/csd-post.sh
 libexec/openconnect/csd-wrapper.sh
+libexec/openconnect/hipreport-android.sh
 libexec/openconnect/hipreport.sh
 libexec/openconnect/tncc-wrapper.py
 man/man8/openconnect.8
diff --git a/net/openconnect/distinfo b/net/openconnect/distinfo
index f327c5245bea..51473db64bb9 100644
--- a/net/openconnect/distinfo
+++ b/net/openconnect/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2019/05/20 14:16:21 schmonz Exp $
+$NetBSD: distinfo,v 1.9 2019/09/07 19:30:21 schmonz Exp $
 
-SHA1 (openconnect-8.03.tar.gz) = 9808b2bc25ceee69d853c8b14f72e7139d4d8843
-RMD160 (openconnect-8.03.tar.gz) = f6d41626b5f0687dc1345a9c8c8b03a740850764
-SHA512 (openconnect-8.03.tar.gz) = e5cae7aacc5684c585992c8199d47c1318a710d2f3638e0b71f5ab3ee7f35406306462e19ba55b32351a3894c83c256569e2e096da0bc8f6404f2740168e73da
-Size (openconnect-8.03.tar.gz) = 1885587 bytes
+SHA1 (openconnect-8.04.tar.gz) = f643b782aaa2a66540517743898ba50e063cf9ce
+RMD160 (openconnect-8.04.tar.gz) = 1a30e71264cf1f8870df391ef9b3bc62cdde166d
+SHA512 (openconnect-8.04.tar.gz) = 3d1f335c5ac62cdcf874b0371e9ed939e5e44060d422b35120d0a6bb87f1a7cc4ffc783e6c65d11a9d5ef974c99e56107da837ee61a03f70d9397e077185050a
+Size (openconnect-8.04.tar.gz) = 1914479 bytes