diff --git a/net/snort/Makefile b/net/snort/Makefile
index 303b4550fad..c7ebd07c7c9 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -1,16 +1,17 @@
-# $OpenBSD: Makefile,v 1.22 2001/12/13 16:25:05 brad Exp $
+# $OpenBSD: Makefile,v 1.23 2002/04/26 12:51:39 bmc Exp $
 
-COMMENT=	"highly flexible sniffer/basic NIDS"
+COMMENT=	"highly flexible sniffer/NIDS"
 
-DISTNAME=	snort-1.8.3
+DISTNAME=	snort-1.8.6
 CATEGORIES=	net security
-NEED_VERSION=	1.500
-MASTER_SITES=	${HOMEPAGE}/releases/
+NEED_VERSION=	1.525
+MASTER_SITES=	${HOMEPAGE}/dl/
 
 HOMEPAGE=       http://www.snort.org
 
 MAINTAINER=	Brian Caswell <bmc@openbsd.org>
 
+# License: GPL
 PERMIT_PACKAGE_CDROM= 	Yes
 PERMIT_PACKAGE_FTP=   	Yes
 PERMIT_DISTFILES_CDROM= Yes
@@ -31,15 +32,11 @@ CONFIGURE_ARGS+= --enable-flexresp
 .if ${FLAVOR:L:Mpostgresql}
 LIB_DEPENDS+=	pq.2::databases/postgresql
 CONFIGURE_ARGS+= --with-postgresql="${LOCALBASE}"
-.else
-CONFIGURE_ARGS+= --without-postgresql
 .endif
 
 .if ${FLAVOR:L:Mmysql}
 LIB_DEPENDS+=	lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql
 CONFIGURE_ARGS+= --with-mysql="${LOCALBASE}"
-.else
-CONFIGURE_ARGS+= --without-mysql
 .endif
 
 .if ${FLAVOR:L:Msmbalert}
@@ -51,6 +48,7 @@ CONFIGURE_ARGS+= --enable-smbalerts
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snort
 	${INSTALL_DATA} ${WRKSRC}/snort.conf ${PREFIX}/share/examples/snort
+	${INSTALL_DATA} ${WRKSRC}/sid-msg.map ${PREFIX}/share/examples/snort
 	${INSTALL_DATA} ${WRKSRC}/classification.config \
 		 ${PREFIX}/share/examples/snort
 	${INSTALL_DATA} ${WRKSRC}/*.rules ${PREFIX}/share/examples/snort
diff --git a/net/snort/distinfo b/net/snort/distinfo
index a9c38cbced6..67bf8c8b3a3 100644
--- a/net/snort/distinfo
+++ b/net/snort/distinfo
@@ -1,3 +1,3 @@
-MD5 (snort-1.8.3.tar.gz) = 21ea22cae02d639b21f8082b47cad27a
-RMD160 (snort-1.8.3.tar.gz) = c475dae94140c9854e40aecff7554309ca9a6cbd
-SHA1 (snort-1.8.3.tar.gz) = c1cc80b5495efeceb6fb07f2dfa6aa813ddf2051
+MD5 (snort-1.8.6.tar.gz) = 6bba7e1cbc837a5c7404d7c0b496780b
+RMD160 (snort-1.8.6.tar.gz) = 7bb15cbe84d12811c0264850167cd3c91a854a6e
+SHA1 (snort-1.8.6.tar.gz) = e60b6a0b3398e61a103ebc5a75da759fe86d710d
diff --git a/net/snort/pkg/DESCR b/net/snort/pkg/DESCR
index 13c45d884e0..53975de5c83 100644
--- a/net/snort/pkg/DESCR
+++ b/net/snort/pkg/DESCR
@@ -1,5 +1,4 @@
-Snort is a fairly intelligent sniffer/NIDS, with a very strong rule set
-ability.
+Snort is a fairly intelligent sniffer/NIDS, with a very strong rule set.
 
 Snort can perform protocol analysis, content searching/matching and can be 
 used to detect a variety of attacks and probes, such as buffer overflows, 
diff --git a/net/snort/pkg/PLIST b/net/snort/pkg/PLIST
index 276edfda541..78ea04ca6f8 100644
--- a/net/snort/pkg/PLIST
+++ b/net/snort/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2001/12/06 18:31:39 bmc Exp $
+@comment $OpenBSD: PLIST,v 1.9 2002/04/26 12:51:39 bmc Exp $
 bin/snort
 man/man8/snort.8
 share/examples/snort/attack-responses.rules
@@ -23,6 +23,7 @@ share/examples/snort/rpc.rules
 share/examples/snort/rservices.rules
 share/examples/snort/scan.rules
 share/examples/snort/shellcode.rules
+share/examples/snort/sid-msg.map
 share/examples/snort/smtp.rules
 share/examples/snort/snort.conf
 share/examples/snort/sql.rules