diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index bcc6bc9e971..e671abacb9c 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,13 +1,12 @@
-# $OpenBSD: Makefile,v 1.101 2015/11/20 16:50:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.102 2015/12/01 23:25:09 sthen Exp $
 
 COMMENT=		virus scanner
-DISTNAME=		clamav-0.98.7
-REVISION=		1
+DISTNAME=		clamav-0.99
 
 CATEGORIES=		security
 
-SHARED_LIBS +=	clamav               22.1     # 7.26
-SHARED_LIBS +=	clamunrar            3.0      # 7.26
+SHARED_LIBS +=	clamav               22.2     # 8.1
+SHARED_LIBS +=	clamunrar            3.0      # 8.1
 SHARED_LIBS +=	clamunrar_iface      3.0
 
 HOMEPAGE=		http://www.clamav.net/
@@ -18,13 +17,14 @@ MAINTAINER=		Stuart Henderson <sthen@openbsd.org>
 PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += bz2 c crypto curl idn ltdl lzma m milter ncurses nghttp2
-WANTLIB += pthread ssl stdc++ xml2 z
+WANTLIB += pcre pthread ssl stdc++ xml2 z
 
 BUILD_DEPENDS=		devel/check \
 			devel/libexecinfo
 
 LIB_DEPENDS=		archivers/bzip2 \
 			devel/libtool,-ltdl \
+			devel/pcre \
 			mail/sendmail,-libmilter \
 			net/curl \
 			textproc/libxml
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index ec9b1688fa4..a827bbc7015 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clamav-0.98.7.tar.gz) = KCQXtwd0DeE82PGNTLyp3dGBz5a0RNssrZiROlFT4nI=
-SIZE (clamav-0.98.7.tar.gz) = 15118851
+SHA256 (clamav-0.99.tar.gz) = 0nksjPrdaF//xAshmWeWKIFd8DH9MUnM+WFkn8h4fqk=
+SIZE (clamav-0.99.tar.gz) = 15968038
diff --git a/security/clamav/patches/patch-clamd_Makefile_in b/security/clamav/patches/patch-clamd_Makefile_in
index 145dee338de..ed8a58e11a9 100644
--- a/security/clamav/patches/patch-clamd_Makefile_in
+++ b/security/clamav/patches/patch-clamd_Makefile_in
@@ -1,14 +1,14 @@
-$OpenBSD: patch-clamd_Makefile_in,v 1.18 2015/04/29 21:27:39 sthen Exp $
---- clamd/Makefile.in.orig	Thu Apr 23 17:02:34 2015
-+++ clamd/Makefile.in	Wed Apr 29 14:49:54 2015
-@@ -253,7 +253,9 @@ JSON_LDFLAGS = @JSON_LDFLAGS@
+$OpenBSD: patch-clamd_Makefile_in,v 1.19 2015/12/01 23:25:09 sthen Exp $
+--- clamd/Makefile.in.orig	Tue Nov 24 21:43:17 2015
++++ clamd/Makefile.in	Tue Dec  1 22:19:38 2015
+@@ -262,7 +262,9 @@ JSON_LDFLAGS = @JSON_LDFLAGS@
  JSON_LIBS = @JSON_LIBS@
  LCOV = @LCOV@
  LD = @LD@
 -LDFLAGS = @LDFLAGS@
 +# Do not generate "LDFLAGS = -L/usr/local/lib" to build on systems that have
 +# have an older libclamav installed.
-+# LDFLAGS = @LDFLAGS@
- LIBADD_DL = @LIBADD_DL@
- LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
- LIBADD_DLOPEN = @LIBADD_DLOPEN@
++#LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
diff --git a/security/clamav/patches/patch-database_Makefile_in b/security/clamav/patches/patch-database_Makefile_in
index 706e1c5714d..52c832765e2 100644
--- a/security/clamav/patches/patch-database_Makefile_in
+++ b/security/clamav/patches/patch-database_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-database_Makefile_in,v 1.15 2015/04/29 21:27:39 sthen Exp $
---- database/Makefile.in.orig	Thu Apr 23 17:02:34 2015
-+++ database/Makefile.in	Wed Apr 29 14:49:54 2015
-@@ -523,6 +523,8 @@ uninstall-am:
+$OpenBSD: patch-database_Makefile_in,v 1.16 2015/12/01 23:25:09 sthen Exp $
+--- database/Makefile.in.orig	Tue Nov 24 21:43:18 2015
++++ database/Makefile.in	Tue Dec  1 22:19:26 2015
+@@ -537,6 +537,8 @@ uninstall-am:
  
  
  install-data-local:
diff --git a/security/clamav/patches/patch-libclamav_Makefile_in b/security/clamav/patches/patch-libclamav_Makefile_in
index 07a18fb1176..452103fbf5c 100644
--- a/security/clamav/patches/patch-libclamav_Makefile_in
+++ b/security/clamav/patches/patch-libclamav_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-libclamav_Makefile_in,v 1.24 2015/04/29 21:27:39 sthen Exp $
---- libclamav/Makefile.in.orig	Thu Apr 23 17:02:34 2015
-+++ libclamav/Makefile.in	Wed Apr 29 14:49:54 2015
-@@ -3379,6 +3379,9 @@ version.h: version.h.tmp
+$OpenBSD: patch-libclamav_Makefile_in,v 1.25 2015/12/01 23:25:09 sthen Exp $
+--- libclamav/Makefile.in.orig	Tue Nov 24 21:43:19 2015
++++ libclamav/Makefile.in	Tue Dec  1 22:19:26 2015
+@@ -3670,6 +3670,9 @@ version.h: version.h.tmp
  	fi
  
  version.h.tmp:
diff --git a/security/clamav/patches/patch-libclamav_ole2_extract_c b/security/clamav/patches/patch-libclamav_ole2_extract_c
index 50cd64e9c41..974e718f707 100644
--- a/security/clamav/patches/patch-libclamav_ole2_extract_c
+++ b/security/clamav/patches/patch-libclamav_ole2_extract_c
@@ -1,10 +1,10 @@
-$OpenBSD: patch-libclamav_ole2_extract_c,v 1.14 2014/11/19 00:18:01 sthen Exp $
+$OpenBSD: patch-libclamav_ole2_extract_c,v 1.15 2015/12/01 23:25:09 sthen Exp $
 
 allow for machine arch where char is unsigned by default (e.g. arm, powerpc)
 
---- libclamav/ole2_extract.c.orig	Thu Nov 13 22:30:43 2014
-+++ libclamav/ole2_extract.c	Tue Nov 18 23:40:53 2014
-@@ -229,7 +229,7 @@ static unsigned char magic_id[] = {0xd0, 0xcf, 0x11, 0
+--- libclamav/ole2_extract.c.orig	Fri Sep 18 21:48:45 2015
++++ libclamav/ole2_extract.c	Tue Dec  1 22:19:26 2015
+@@ -231,7 +231,7 @@ static unsigned char magic_id[] = {0xd0, 0xcf, 0x11, 0
  
  
  static char    *
diff --git a/security/clamav/patches/patch-libclamav_str_c b/security/clamav/patches/patch-libclamav_str_c
index 5a34a865a9b..0d37cd429c2 100644
--- a/security/clamav/patches/patch-libclamav_str_c
+++ b/security/clamav/patches/patch-libclamav_str_c
@@ -1,10 +1,10 @@
-$OpenBSD: patch-libclamav_str_c,v 1.11 2014/11/19 00:18:01 sthen Exp $
+$OpenBSD: patch-libclamav_str_c,v 1.12 2015/12/01 23:25:09 sthen Exp $
 
 allow for machine arch where char is unsigned by default (e.g. arm, powerpc)
 
---- libclamav/str.c.orig	Tue Jul  8 15:50:23 2014
-+++ libclamav/str.c	Wed Jul  9 00:58:02 2014
-@@ -166,9 +166,9 @@ int cli_hex2str_to(const char *hex, char *ptr, size_t 
+--- libclamav/str.c.orig	Fri Sep 18 21:48:45 2015
++++ libclamav/str.c	Tue Dec  1 22:19:26 2015
+@@ -167,9 +167,9 @@ int cli_hex2str_to(const char *hex, char *ptr, size_t 
  
      for(i = 0; i < len; i += 2) {
  	if((c = cli_hex2int(hex[i])) >= 0) {
diff --git a/security/clamav/patches/patch-libclamav_vba_extract_c b/security/clamav/patches/patch-libclamav_vba_extract_c
index ad1a5921bbd..dc7abeb16fc 100644
--- a/security/clamav/patches/patch-libclamav_vba_extract_c
+++ b/security/clamav/patches/patch-libclamav_vba_extract_c
@@ -1,10 +1,10 @@
-$OpenBSD: patch-libclamav_vba_extract_c,v 1.10 2014/11/19 00:18:01 sthen Exp $
+$OpenBSD: patch-libclamav_vba_extract_c,v 1.11 2015/12/01 23:25:09 sthen Exp $
 
 allow for machine arch where char is unsigned by default (e.g. arm, powerpc)
 
---- libclamav/vba_extract.c.orig	Tue Jul  8 15:50:23 2014
-+++ libclamav/vba_extract.c	Wed Jul  9 00:58:02 2014
-@@ -98,7 +98,7 @@ vba_endian_convert_32(uint32_t value, int big_endian)
+--- libclamav/vba_extract.c.orig	Fri Sep 18 21:48:45 2015
++++ libclamav/vba_extract.c	Tue Dec  1 22:19:26 2015
+@@ -99,7 +99,7 @@ vba_endian_convert_32(uint32_t value, int big_endian)
  
  
  static char *
diff --git a/security/clamav/patches/patch-unit_tests_Makefile_in b/security/clamav/patches/patch-unit_tests_Makefile_in
index 61577677b17..84f519a054e 100644
--- a/security/clamav/patches/patch-unit_tests_Makefile_in
+++ b/security/clamav/patches/patch-unit_tests_Makefile_in
@@ -1,10 +1,10 @@
-$OpenBSD: patch-unit_tests_Makefile_in,v 1.5 2015/04/29 21:27:39 sthen Exp $
+$OpenBSD: patch-unit_tests_Makefile_in,v 1.6 2015/12/01 23:25:09 sthen Exp $
 
 unnecessary gnu-ism
 
---- unit_tests/Makefile.in.orig	Thu Apr 23 17:02:34 2015
-+++ unit_tests/Makefile.in	Wed Apr 29 14:49:54 2015
-@@ -1212,7 +1212,7 @@ check_clamd.sh: $(top_builddir)/test/clam.exe check_cl
+--- unit_tests/Makefile.in.orig	Tue Nov 24 21:43:19 2015
++++ unit_tests/Makefile.in	Tue Dec  1 22:19:26 2015
+@@ -1226,7 +1226,7 @@ check_clamd.sh: $(top_builddir)/test/clam.exe check_cl
  check_clamscan.sh: $(top_builddir)/test/clam.exe
  
  clamav.hdb: input/clamav.hdb