diff --git a/security/aide/Makefile b/security/aide/Makefile
index e6b9fb822647..4dc134f60213 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	aide
-PORTVERSION=	0.17.4
+PORTVERSION=	0.18.6
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/aide/aide/releases/download/v${PORTVERSION}/
 
@@ -8,16 +8,23 @@ COMMENT=	File and directory integrity checker
 WWW=		https://aide.github.io/
 
 LIB_DEPENDS=	libmhash.so:security/mhash \
-		libpcre.so:devel/pcre
+		libpcre.so:devel/pcre \
+		libe2p.so:sysutils/e2fsprogs-core
 
 USES=		bison gmake localbase
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-mhash \
 		--with-zlib \
+		--with-posix-acl \
+		--with-e2fsattrs \
 		--mandir=${MANPREFIX}/man \
 		--with-config_file=${PREFIX}/etc/aide.conf
-CONFIGURE_ENV=	YACC="bison -y"
+CONFIGURE_ENV=	YACC="bison -y" \
+		POSIX_ACL_CFLAGS="-I/usr/include/sys" \
+		POSIX_ACL_LIBS="-L/usr/lib" \
+		MHASH_CFLAGS="-I${LOCALBASE}/include" \
+		MHASH_LIBS="-L${LOCALBASE}/lib -lmhash"
 
 LDFLAGS+=	-lpthread
 
diff --git a/security/aide/distinfo b/security/aide/distinfo
index 73ae932bb832..c9a6802d2c25 100644
--- a/security/aide/distinfo
+++ b/security/aide/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642975384
-SHA256 (aide-0.17.4.tar.gz) = c81505246f3ffc2e76036d43a77212ae82895b5881d9b9e25c1361b1a9b7a846
-SIZE (aide-0.17.4.tar.gz) = 331783
+TIMESTAMP = 1699587126
+SHA256 (aide-0.18.6.tar.gz) = 8ff36ce47d37d0cc987762d5d961346d475de74bba8a1832fd006db6edd3c10e
+SIZE (aide-0.18.6.tar.gz) = 383127
diff --git a/security/aide/files/patch-Makefile.in b/security/aide/files/patch-Makefile.in
new file mode 100644
index 000000000000..2fc6aab8f0fe
--- /dev/null
+++ b/security/aide/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in	2023-11-09 23:11:13.630766000 -0500
++++ Makefile.in	2023-11-09 23:11:38.720488000 -0500
+@@ -377,7 +377,7 @@
+ CAPABILITIES_LIBS = @CAPABILITIES_LIBS@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @E2FSATTRS_CFLAGS@
+ CHECK_CFLAGS = @CHECK_CFLAGS@
+ CHECK_LIBS = @CHECK_LIBS@
+ CPP = @CPP@
diff --git a/security/aide/files/patch-src_commandconf.c b/security/aide/files/patch-src_commandconf.c
deleted file mode 100644
index d9c980015ee2..000000000000
--- a/security/aide/files/patch-src_commandconf.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/commandconf.c.orig	2022-01-19 12:03:06.000000000 -0800
-+++ src/commandconf.c	2022-01-23 14:49:37.915576000 -0800
-@@ -226,8 +226,8 @@
-       c=fgetc(db->fp);
-       if(c==(unsigned char)'\213'){
-     log_msg(LOG_LEVEL_DEBUG,"db_input_wrapper(): handle gzip header");
--    lseek(fileno(db->fp),0L,SEEK_SET);
--    db->gzp=gzdopen(fileno(db->fp),"rb");
-+    lseek(fileno((FILE *)(db->fp)),0L,SEEK_SET);
-+    db->gzp=gzdopen(fileno((FILE *)(db->fp)),"rb");
-     c=gzgetc(db->gzp);
-     log_msg(LOG_LEVEL_DEBUG, "db_input_wrapper(): first character after gzip header is: %c(%#X)\n",c,c);
-   if(c==-1) {