diff --git a/net/snort/Makefile b/net/snort/Makefile
index a9b6fa130f0..3ecd3169656 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.80 2013/07/10 02:10:22 lteo Exp $
+# $OpenBSD: Makefile,v 1.81 2013/08/21 02:28:42 lteo Exp $
 
 SHARED_ONLY =		Yes
 
 COMMENT =		highly flexible sniffer/NIDS
 
-VERSION =		2.9.5.0
-DISTNAME =		snort-2.9.5
+VERSION =		2.9.5.3
+DISTNAME =		snort-${VERSION}
 
 CATEGORIES =		net security
 
@@ -25,7 +25,8 @@ USE_GROFF =		Yes
 SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--disable-static-daq
+			--disable-static-daq \
+			--enable-non-ether-decoders
 
 LIB_DEPENDS =		devel/pcre \
 			net/libdnet \
diff --git a/net/snort/distinfo b/net/snort/distinfo
index a29a9f99bb9..8ba11e3be58 100644
--- a/net/snort/distinfo
+++ b/net/snort/distinfo
@@ -1,2 +1,2 @@
-SHA256 (snort-2.9.5.tar.gz) = H5mXcW6MCGydYIKUpVwyOEaHfI8WrNEpqQyl+tu6GJA=
-SIZE (snort-2.9.5.tar.gz) = 5422421
+SHA256 (snort-2.9.5.3.tar.gz) = Pv0x/TN+g2r1PXkPwpl/SfzDUeUHHUxuT1hqiLBwxSo=
+SIZE (snort-2.9.5.3.tar.gz) = 5047591
diff --git a/net/snort/patches/patch-etc_snort_conf b/net/snort/patches/patch-etc_snort_conf
index d385bfb91ce..48efcde49f0 100644
--- a/net/snort/patches/patch-etc_snort_conf
+++ b/net/snort/patches/patch-etc_snort_conf
@@ -1,9 +1,9 @@
-$OpenBSD: patch-etc_snort_conf,v 1.9 2013/04/23 02:04:13 lteo Exp $
+$OpenBSD: patch-etc_snort_conf,v 1.10 2013/08/21 02:28:43 lteo Exp $
 
 reputation preprocessor disabled, still experimental
 
---- etc/snort.conf.orig	Thu Mar 21 14:09:05 2013
-+++ etc/snort.conf	Thu Apr  4 22:31:37 2013
+--- etc/snort.conf.orig	Tue Jul 23 14:37:33 2013
++++ etc/snort.conf	Mon Aug  5 14:38:56 2013
 @@ -101,17 +101,17 @@ ipvar AIM_SERVERS [64.12.24.0/23,64.12.28.0/23,64.12.1
  # Path to your rules files (this can be a relative path)
  # Note for Windows users:  You are advised to make this an absolute path,
@@ -65,7 +65,7 @@ reputation preprocessor disabled, still experimental
  include $RULE_PATH/app-detect.rules
  include $RULE_PATH/attack-responses.rules
  include $RULE_PATH/backdoor.rules
-@@ -648,6 +650,9 @@ include $RULE_PATH/web-iis.rules
+@@ -659,6 +661,9 @@ include $RULE_PATH/web-iis.rules
  include $RULE_PATH/web-misc.rules
  include $RULE_PATH/web-php.rules
  include $RULE_PATH/x11.rules
diff --git a/net/snort/patches/patch-src_decode_h b/net/snort/patches/patch-src_decode_h
index 7fd2492f7ae..288351f6554 100644
--- a/net/snort/patches/patch-src_decode_h
+++ b/net/snort/patches/patch-src_decode_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_decode_h,v 1.4 2013/07/10 02:10:22 lteo Exp $
---- src/decode.h.orig	Tue Jun  4 23:19:52 2013
-+++ src/decode.h	Tue Jul  2 20:52:28 2013
-@@ -812,9 +812,9 @@ typedef struct _SLLHdr {
+$OpenBSD: patch-src_decode_h,v 1.5 2013/08/21 02:28:43 lteo Exp $
+--- src/decode.h.orig	Wed Jul  3 17:31:22 2013
++++ src/decode.h	Mon Aug  5 14:37:49 2013
+@@ -813,9 +813,9 @@ typedef struct _SLLHdr {
   * Pflog1_Hdr:  CVS = 1.3,  DLT_OLD_PFLOG = 17,  Length = 28
   * Pflog2_Hdr:  CVS = 1.8,  DLT_PFLOG     = 117, Length = 48
   * Pflog3_Hdr:  CVS = 1.12, DLT_PFLOG     = 117, Length = 64
diff --git a/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in b/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in
index 95958f09edd..c0b3ca84f30 100644
--- a/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in
+++ b/net/snort/patches/patch-src_dynamic-preprocessors_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.11 2013/07/10 02:10:22 lteo Exp $
---- src/dynamic-preprocessors/Makefile.in.orig	Tue Jun  4 23:21:39 2013
-+++ src/dynamic-preprocessors/Makefile.in	Mon Jul  1 23:06:13 2013
-@@ -1333,19 +1333,8 @@ clean-local:
+$OpenBSD: patch-src_dynamic-preprocessors_Makefile_in,v 1.12 2013/08/21 02:28:43 lteo Exp $
+--- src/dynamic-preprocessors/Makefile.in.orig	Tue Jul 23 14:35:44 2013
++++ src/dynamic-preprocessors/Makefile.in	Mon Aug  5 14:37:49 2013
+@@ -1327,19 +1327,8 @@ clean-local:
  	rm -rf include build
  
  install-data-local:
diff --git a/net/snort/patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in b/net/snort/patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
index 8868f60735f..4f2e15937e6 100644
--- a/net/snort/patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
+++ b/net/snort/patches/patch-src_dynamic-preprocessors_dcerpc2_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v 1.7 2013/05/31 20:26:01 lteo Exp $
---- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig	Mon Apr 15 15:57:47 2013
-+++ src/dynamic-preprocessors/dcerpc2/Makefile.in	Wed Apr 24 14:51:57 2013
+$OpenBSD: patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v 1.8 2013/08/21 02:28:43 lteo Exp $
+--- src/dynamic-preprocessors/dcerpc2/Makefile.in.orig	Tue Jul 23 14:35:44 2013
++++ src/dynamic-preprocessors/dcerpc2/Makefile.in	Mon Aug  5 14:37:49 2013
 @@ -262,7 +262,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_dcerpc2_Makefile_in,v 1.7 2013/05/31 2
  @SO_WITH_STATIC_LIB_TRUE@libsf_dce2_preproc_la_LIBADD = ../libsf_dynamic_preproc.la
  @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_dce2_preproc_la_SOURCES = \
  @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -502,7 +502,7 @@ distdir: $(DISTFILES)
+@@ -518,7 +518,7 @@ distdir: $(DISTFILES)
  	done
  check-am: all-am
  check: check-am
diff --git a/net/snort/patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in b/net/snort/patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in
index 7ce407eefa1..ff9876ee2f9 100644
--- a/net/snort/patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in
+++ b/net/snort/patches/patch-src_dynamic-preprocessors_dnp3_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_dynamic-preprocessors_dnp3_Makefile_in,v 1.5 2013/05/31 20:26:01 lteo Exp $
---- src/dynamic-preprocessors/dnp3/Makefile.in.orig	Mon Apr 15 15:57:47 2013
-+++ src/dynamic-preprocessors/dnp3/Makefile.in	Wed Apr 24 14:51:57 2013
+$OpenBSD: patch-src_dynamic-preprocessors_dnp3_Makefile_in,v 1.6 2013/08/21 02:28:43 lteo Exp $
+--- src/dynamic-preprocessors/dnp3/Makefile.in.orig	Tue Jul 23 14:35:44 2013
++++ src/dynamic-preprocessors/dnp3/Makefile.in	Mon Aug  5 14:37:49 2013
 @@ -259,7 +259,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_dnp3_Makefile_in,v 1.5 2013/05/31 20:2
  @SO_WITH_STATIC_LIB_TRUE@libsf_dnp3_preproc_la_LIBADD = ../libsf_dynamic_preproc.la
  @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_dnp3_preproc_la_SOURCES = \
  @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -468,7 +468,7 @@ distdir: $(DISTFILES)
+@@ -484,7 +484,7 @@ distdir: $(DISTFILES)
  	done
  check-am: all-am
  check: check-am
diff --git a/net/snort/patches/patch-src_dynamic-preprocessors_dns_Makefile_in b/net/snort/patches/patch-src_dynamic-preprocessors_dns_Makefile_in
index 3a092d8e8f1..b1dde383e4f 100644
--- a/net/snort/patches/patch-src_dynamic-preprocessors_dns_Makefile_in
+++ b/net/snort/patches/patch-src_dynamic-preprocessors_dns_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_dynamic-preprocessors_dns_Makefile_in,v 1.9 2013/05/31 20:26:01 lteo Exp $
---- src/dynamic-preprocessors/dns/Makefile.in.orig	Mon Apr 15 15:57:47 2013
-+++ src/dynamic-preprocessors/dns/Makefile.in	Wed Apr 24 14:51:57 2013
+$OpenBSD: patch-src_dynamic-preprocessors_dns_Makefile_in,v 1.10 2013/08/21 02:28:43 lteo Exp $
+--- src/dynamic-preprocessors/dns/Makefile.in.orig	Tue Jul 23 14:35:45 2013
++++ src/dynamic-preprocessors/dns/Makefile.in	Mon Aug  5 14:37:49 2013
 @@ -257,7 +257,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_dns_Makefile_in,v 1.9 2013/05/31 20:26
  @SO_WITH_STATIC_LIB_TRUE@libsf_dns_preproc_la_LIBADD = ../libsf_dynamic_preproc.la
  @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_dns_preproc_la_SOURCES = \
  @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -450,7 +450,7 @@ distdir: $(DISTFILES)
+@@ -466,7 +466,7 @@ distdir: $(DISTFILES)
  	done
  check-am: all-am
  check: check-am
diff --git a/net/snort/patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in b/net/snort/patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
index 61a64b9f9b2..f115abb7df4 100644
--- a/net/snort/patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
+++ b/net/snort/patches/patch-src_dynamic-preprocessors_ftptelnet_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v 1.10 2013/05/31 20:26:02 lteo Exp $
---- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig	Mon Apr 15 15:57:47 2013
-+++ src/dynamic-preprocessors/ftptelnet/Makefile.in	Wed Apr 24 14:51:57 2013
+$OpenBSD: patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v 1.11 2013/08/21 02:28:44 lteo Exp $
+--- src/dynamic-preprocessors/ftptelnet/Makefile.in.orig	Tue Jul 23 14:35:45 2013
++++ src/dynamic-preprocessors/ftptelnet/Makefile.in	Mon Aug  5 14:37:49 2013
 @@ -264,7 +264,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_ftptelnet_Makefile_in,v 1.10 2013/05/3
  @SO_WITH_STATIC_LIB_TRUE@libsf_ftptelnet_preproc_la_LIBADD = ../libsf_dynamic_preproc.la
  @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_ftptelnet_preproc_la_SOURCES = \
  @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -499,7 +499,7 @@ distdir: $(DISTFILES)
+@@ -515,7 +515,7 @@ distdir: $(DISTFILES)
  	done
  check-am: all-am
  check: check-am
diff --git a/net/snort/patches/patch-src_dynamic-preprocessors_gtp_Makefile_in b/net/snort/patches/patch-src_dynamic-preprocessors_gtp_Makefile_in
index 5ff857456b8..58843c2962f 100644
--- a/net/snort/patches/patch-src_dynamic-preprocessors_gtp_Makefile_in
+++ b/net/snort/patches/patch-src_dynamic-preprocessors_gtp_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_dynamic-preprocessors_gtp_Makefile_in,v 1.5 2013/05/31 20:26:02 lteo Exp $
---- src/dynamic-preprocessors/gtp/Makefile.in.orig	Mon Apr 15 15:57:47 2013
-+++ src/dynamic-preprocessors/gtp/Makefile.in	Wed Apr 24 14:51:57 2013
+$OpenBSD: patch-src_dynamic-preprocessors_gtp_Makefile_in,v 1.6 2013/08/21 02:28:44 lteo Exp $
+--- src/dynamic-preprocessors/gtp/Makefile.in.orig	Tue Jul 23 14:35:45 2013
++++ src/dynamic-preprocessors/gtp/Makefile.in	Mon Aug  5 14:37:49 2013
 @@ -258,7 +258,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_gtp_Makefile_in,v 1.5 2013/05/31 20:26
  @SO_WITH_STATIC_LIB_TRUE@libsf_gtp_preproc_la_LIBADD = ../libsf_dynamic_preproc.la
  @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_gtp_preproc_la_SOURCES = \
  @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -458,7 +458,7 @@ distdir: $(DISTFILES)
+@@ -474,7 +474,7 @@ distdir: $(DISTFILES)
  	done
  check-am: all-am
  check: check-am
diff --git a/net/snort/patches/patch-src_dynamic-preprocessors_imap_Makefile_in b/net/snort/patches/patch-src_dynamic-preprocessors_imap_Makefile_in
index c8433a723c3..9d9727af335 100644
--- a/net/snort/patches/patch-src_dynamic-preprocessors_imap_Makefile_in
+++ b/net/snort/patches/patch-src_dynamic-preprocessors_imap_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_dynamic-preprocessors_imap_Makefile_in,v 1.5 2013/05/31 20:26:02 lteo Exp $
---- src/dynamic-preprocessors/imap/Makefile.in.orig	Mon Apr 15 15:57:48 2013
-+++ src/dynamic-preprocessors/imap/Makefile.in	Wed Apr 24 14:51:57 2013
+$OpenBSD: patch-src_dynamic-preprocessors_imap_Makefile_in,v 1.6 2013/08/21 02:28:44 lteo Exp $
+--- src/dynamic-preprocessors/imap/Makefile.in.orig	Tue Jul 23 14:35:45 2013
++++ src/dynamic-preprocessors/imap/Makefile.in	Mon Aug  5 14:37:49 2013
 @@ -261,7 +261,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_imap_Makefile_in,v 1.5 2013/05/31 20:2
  @SO_WITH_STATIC_LIB_TRUE@libsf_imap_preproc_la_LIBADD = ../libsf_dynamic_preproc.la
  @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_imap_preproc_la_SOURCES = \
  @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -482,7 +482,7 @@ distdir: $(DISTFILES)
+@@ -498,7 +498,7 @@ distdir: $(DISTFILES)
  	done
  check-am: all-am
  check: check-am
diff --git a/net/snort/patches/patch-src_dynamic-preprocessors_modbus_Makefile_in b/net/snort/patches/patch-src_dynamic-preprocessors_modbus_Makefile_in
index 672843d4a10..45b411e2d1e 100644
--- a/net/snort/patches/patch-src_dynamic-preprocessors_modbus_Makefile_in
+++ b/net/snort/patches/patch-src_dynamic-preprocessors_modbus_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_dynamic-preprocessors_modbus_Makefile_in,v 1.5 2013/05/31 20:26:02 lteo Exp $
---- src/dynamic-preprocessors/modbus/Makefile.in.orig	Mon Apr 15 15:57:48 2013
-+++ src/dynamic-preprocessors/modbus/Makefile.in	Wed Apr 24 14:51:57 2013
+$OpenBSD: patch-src_dynamic-preprocessors_modbus_Makefile_in,v 1.6 2013/08/21 02:28:44 lteo Exp $
+--- src/dynamic-preprocessors/modbus/Makefile.in.orig	Tue Jul 23 14:35:45 2013
++++ src/dynamic-preprocessors/modbus/Makefile.in	Mon Aug  5 14:37:49 2013
 @@ -259,7 +259,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_modbus_Makefile_in,v 1.5 2013/05/31 20
  @SO_WITH_STATIC_LIB_TRUE@libsf_modbus_preproc_la_LIBADD = ../libsf_dynamic_preproc.la
  @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_modbus_preproc_la_SOURCES = \
  @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -458,7 +458,7 @@ distdir: $(DISTFILES)
+@@ -474,7 +474,7 @@ distdir: $(DISTFILES)
  	done
  check-am: all-am
  check: check-am
diff --git a/net/snort/patches/patch-src_dynamic-preprocessors_pop_Makefile_in b/net/snort/patches/patch-src_dynamic-preprocessors_pop_Makefile_in
index dfe1f4d2b2a..4bcb72f431c 100644
--- a/net/snort/patches/patch-src_dynamic-preprocessors_pop_Makefile_in
+++ b/net/snort/patches/patch-src_dynamic-preprocessors_pop_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_dynamic-preprocessors_pop_Makefile_in,v 1.5 2013/05/31 20:26:02 lteo Exp $
---- src/dynamic-preprocessors/pop/Makefile.in.orig	Mon Apr 15 15:57:48 2013
-+++ src/dynamic-preprocessors/pop/Makefile.in	Wed Apr 24 14:51:57 2013
+$OpenBSD: patch-src_dynamic-preprocessors_pop_Makefile_in,v 1.6 2013/08/21 02:28:44 lteo Exp $
+--- src/dynamic-preprocessors/pop/Makefile.in.orig	Tue Jul 23 14:35:45 2013
++++ src/dynamic-preprocessors/pop/Makefile.in	Mon Aug  5 14:37:49 2013
 @@ -261,7 +261,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_pop_Makefile_in,v 1.5 2013/05/31 20:26
  @SO_WITH_STATIC_LIB_TRUE@libsf_pop_preproc_la_LIBADD = ../libsf_dynamic_preproc.la
  @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_pop_preproc_la_SOURCES = \
  @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -482,7 +482,7 @@ distdir: $(DISTFILES)
+@@ -498,7 +498,7 @@ distdir: $(DISTFILES)
  	done
  check-am: all-am
  check: check-am
diff --git a/net/snort/patches/patch-src_dynamic-preprocessors_reputation_Makefile_in b/net/snort/patches/patch-src_dynamic-preprocessors_reputation_Makefile_in
index b52b3df7321..aab956f3bb1 100644
--- a/net/snort/patches/patch-src_dynamic-preprocessors_reputation_Makefile_in
+++ b/net/snort/patches/patch-src_dynamic-preprocessors_reputation_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_dynamic-preprocessors_reputation_Makefile_in,v 1.5 2013/05/31 20:26:03 lteo Exp $
---- src/dynamic-preprocessors/reputation/Makefile.in.orig	Mon Apr 15 15:57:48 2013
-+++ src/dynamic-preprocessors/reputation/Makefile.in	Wed Apr 24 14:51:57 2013
+$OpenBSD: patch-src_dynamic-preprocessors_reputation_Makefile_in,v 1.6 2013/08/21 02:28:44 lteo Exp $
+--- src/dynamic-preprocessors/reputation/Makefile.in.orig	Tue Jul 23 14:35:46 2013
++++ src/dynamic-preprocessors/reputation/Makefile.in	Mon Aug  5 14:37:49 2013
 @@ -276,7 +276,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_reputation_Makefile_in,v 1.5 2013/05/3
  @SO_WITH_STATIC_LIB_TRUE@libsf_reputation_preproc_la_LIBADD = ../libsf_dynamic_preproc.la
  @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_reputation_preproc_la_SOURCES = \
  @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -533,7 +533,7 @@ distdir: $(DISTFILES)
+@@ -549,7 +549,7 @@ distdir: $(DISTFILES)
  	done
  check-am: all-am
  check: check-am
diff --git a/net/snort/patches/patch-src_dynamic-preprocessors_sdf_Makefile_in b/net/snort/patches/patch-src_dynamic-preprocessors_sdf_Makefile_in
index 872ed744a16..b96a51bb558 100644
--- a/net/snort/patches/patch-src_dynamic-preprocessors_sdf_Makefile_in
+++ b/net/snort/patches/patch-src_dynamic-preprocessors_sdf_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_dynamic-preprocessors_sdf_Makefile_in,v 1.6 2013/05/31 20:26:03 lteo Exp $
---- src/dynamic-preprocessors/sdf/Makefile.in.orig	Mon Apr 15 15:57:48 2013
-+++ src/dynamic-preprocessors/sdf/Makefile.in	Wed Apr 24 14:51:57 2013
+$OpenBSD: patch-src_dynamic-preprocessors_sdf_Makefile_in,v 1.7 2013/08/21 02:28:44 lteo Exp $
+--- src/dynamic-preprocessors/sdf/Makefile.in.orig	Tue Jul 23 14:35:46 2013
++++ src/dynamic-preprocessors/sdf/Makefile.in	Mon Aug  5 14:37:49 2013
 @@ -258,7 +258,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_sdf_Makefile_in,v 1.6 2013/05/31 20:26
  @SO_WITH_STATIC_LIB_TRUE@libsf_sdf_preproc_la_LIBADD = ../libsf_dynamic_preproc.la
  @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_sdf_preproc_la_SOURCES = \
  @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -459,7 +459,7 @@ distdir: $(DISTFILES)
+@@ -475,7 +475,7 @@ distdir: $(DISTFILES)
  	done
  check-am: all-am
  check: check-am
diff --git a/net/snort/patches/patch-src_dynamic-preprocessors_sip_Makefile_in b/net/snort/patches/patch-src_dynamic-preprocessors_sip_Makefile_in
index 45260bc482e..cddf6617a2c 100644
--- a/net/snort/patches/patch-src_dynamic-preprocessors_sip_Makefile_in
+++ b/net/snort/patches/patch-src_dynamic-preprocessors_sip_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_dynamic-preprocessors_sip_Makefile_in,v 1.5 2013/05/31 20:26:03 lteo Exp $
---- src/dynamic-preprocessors/sip/Makefile.in.orig	Mon Apr 15 15:57:48 2013
-+++ src/dynamic-preprocessors/sip/Makefile.in	Wed Apr 24 14:51:57 2013
+$OpenBSD: patch-src_dynamic-preprocessors_sip_Makefile_in,v 1.6 2013/08/21 02:28:44 lteo Exp $
+--- src/dynamic-preprocessors/sip/Makefile.in.orig	Tue Jul 23 14:35:46 2013
++++ src/dynamic-preprocessors/sip/Makefile.in	Mon Aug  5 14:37:49 2013
 @@ -258,7 +258,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_sip_Makefile_in,v 1.5 2013/05/31 20:26
  @SO_WITH_STATIC_LIB_TRUE@libsf_sip_preproc_la_LIBADD = ../libsf_dynamic_preproc.la
  @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_sip_preproc_la_SOURCES = \
  @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -466,7 +466,7 @@ distdir: $(DISTFILES)
+@@ -482,7 +482,7 @@ distdir: $(DISTFILES)
  	done
  check-am: all-am
  check: check-am
diff --git a/net/snort/patches/patch-src_dynamic-preprocessors_smtp_Makefile_in b/net/snort/patches/patch-src_dynamic-preprocessors_smtp_Makefile_in
index eec36352fd3..8e71aa7b2d4 100644
--- a/net/snort/patches/patch-src_dynamic-preprocessors_smtp_Makefile_in
+++ b/net/snort/patches/patch-src_dynamic-preprocessors_smtp_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_dynamic-preprocessors_smtp_Makefile_in,v 1.9 2013/05/31 20:26:03 lteo Exp $
---- src/dynamic-preprocessors/smtp/Makefile.in.orig	Mon Apr 15 15:57:49 2013
-+++ src/dynamic-preprocessors/smtp/Makefile.in	Wed Apr 24 14:51:58 2013
+$OpenBSD: patch-src_dynamic-preprocessors_smtp_Makefile_in,v 1.10 2013/08/21 02:28:45 lteo Exp $
+--- src/dynamic-preprocessors/smtp/Makefile.in.orig	Tue Jul 23 14:35:46 2013
++++ src/dynamic-preprocessors/smtp/Makefile.in	Mon Aug  5 14:37:49 2013
 @@ -262,7 +262,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_smtp_Makefile_in,v 1.9 2013/05/31 20:2
  @SO_WITH_STATIC_LIB_TRUE@libsf_smtp_preproc_la_LIBADD = ../libsf_dynamic_preproc.la
  @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_smtp_preproc_la_SOURCES = \
  @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -492,7 +492,7 @@ distdir: $(DISTFILES)
+@@ -508,7 +508,7 @@ distdir: $(DISTFILES)
  	done
  check-am: all-am
  check: check-am
diff --git a/net/snort/patches/patch-src_dynamic-preprocessors_ssh_Makefile_in b/net/snort/patches/patch-src_dynamic-preprocessors_ssh_Makefile_in
index 6b684527394..70e3746d258 100644
--- a/net/snort/patches/patch-src_dynamic-preprocessors_ssh_Makefile_in
+++ b/net/snort/patches/patch-src_dynamic-preprocessors_ssh_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_dynamic-preprocessors_ssh_Makefile_in,v 1.8 2013/05/31 20:26:03 lteo Exp $
---- src/dynamic-preprocessors/ssh/Makefile.in.orig	Mon Apr 15 15:57:49 2013
-+++ src/dynamic-preprocessors/ssh/Makefile.in	Wed Apr 24 14:51:58 2013
+$OpenBSD: patch-src_dynamic-preprocessors_ssh_Makefile_in,v 1.9 2013/08/21 02:28:45 lteo Exp $
+--- src/dynamic-preprocessors/ssh/Makefile.in.orig	Tue Jul 23 14:35:46 2013
++++ src/dynamic-preprocessors/ssh/Makefile.in	Mon Aug  5 14:37:49 2013
 @@ -257,7 +257,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_ssh_Makefile_in,v 1.8 2013/05/31 20:26
  @SO_WITH_STATIC_LIB_TRUE@libsf_ssh_preproc_la_LIBADD = ../libsf_dynamic_preproc.la
  @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_ssh_preproc_la_SOURCES = \
  @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -450,7 +450,7 @@ distdir: $(DISTFILES)
+@@ -466,7 +466,7 @@ distdir: $(DISTFILES)
  	done
  check-am: all-am
  check: check-am
diff --git a/net/snort/patches/patch-src_dynamic-preprocessors_ssl_Makefile_in b/net/snort/patches/patch-src_dynamic-preprocessors_ssl_Makefile_in
index 6f3299bb72d..faf12a6fc51 100644
--- a/net/snort/patches/patch-src_dynamic-preprocessors_ssl_Makefile_in
+++ b/net/snort/patches/patch-src_dynamic-preprocessors_ssl_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_dynamic-preprocessors_ssl_Makefile_in,v 1.7 2013/05/31 20:26:03 lteo Exp $
---- src/dynamic-preprocessors/ssl/Makefile.in.orig	Mon Apr 15 15:57:49 2013
-+++ src/dynamic-preprocessors/ssl/Makefile.in	Wed Apr 24 14:51:58 2013
+$OpenBSD: patch-src_dynamic-preprocessors_ssl_Makefile_in,v 1.8 2013/08/21 02:28:45 lteo Exp $
+--- src/dynamic-preprocessors/ssl/Makefile.in.orig	Tue Jul 23 14:35:46 2013
++++ src/dynamic-preprocessors/ssl/Makefile.in	Mon Aug  5 14:37:49 2013
 @@ -257,7 +257,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_dynamic-preprocessors_ssl_Makefile_in,v 1.7 2013/05/31 20:26
  @SO_WITH_STATIC_LIB_TRUE@libsf_ssl_preproc_la_LIBADD = ../libsf_dynamic_preproc.la
  @SO_WITH_STATIC_LIB_FALSE@nodist_libsf_ssl_preproc_la_SOURCES = \
  @SO_WITH_STATIC_LIB_FALSE@../include/sf_dynamic_preproc_lib.c \
-@@ -460,7 +460,7 @@ distdir: $(DISTFILES)
+@@ -476,7 +476,7 @@ distdir: $(DISTFILES)
  	done
  check-am: all-am
  check: check-am
diff --git a/net/snort/patches/patch-src_ppm_c b/net/snort/patches/patch-src_ppm_c
index dc114567264..1c8bfb4cf1b 100644
--- a/net/snort/patches/patch-src_ppm_c
+++ b/net/snort/patches/patch-src_ppm_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_ppm_c,v 1.7 2013/07/10 02:10:22 lteo Exp $
---- src/ppm.c.orig	Tue Jun  4 23:19:52 2013
-+++ src/ppm.c	Mon Jul  1 23:00:43 2013
-@@ -505,7 +505,7 @@ void ppm_rule_log(ppm_cfg_t *ppm_cfg, uint64_t pktcnt,
+$OpenBSD: patch-src_ppm_c,v 1.8 2013/08/21 02:28:45 lteo Exp $
+--- src/ppm.c.orig	Wed Jul  3 17:31:22 2013
++++ src/ppm.c	Mon Aug  5 14:37:49 2013
+@@ -509,7 +509,7 @@ void ppm_rule_log(ppm_cfg_t *ppm_cfg, uint64_t pktcnt,
              int i;
  
              if(!*timestamp)
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_ppm_c,v 1.7 2013/07/10 02:10:22 lteo Exp $
  
              for (i=0; i< ppm_n_crules; i++)
              {
-@@ -584,7 +584,7 @@ void ppm_rule_log(ppm_cfg_t *ppm_cfg, uint64_t pktcnt,
+@@ -588,7 +588,7 @@ void ppm_rule_log(ppm_cfg_t *ppm_cfg, uint64_t pktcnt,
              LogMessage(PPM_FMT_SUS_PKT, pktcnt, src, p->sp, dst, p->dp);
  
              if(!*timestamp)
diff --git a/net/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c b/net/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
index 8c72454ccba..106e1070e6a 100644
--- a/net/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
+++ b/net/snort/patches/patch-src_preprocessors_Stream5_snort_stream5_tcp_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v 1.9 2013/07/10 02:10:22 lteo Exp $
---- src/preprocessors/Stream5/snort_stream5_tcp.c.orig	Tue Jun  4 23:19:53 2013
-+++ src/preprocessors/Stream5/snort_stream5_tcp.c	Mon Jul  1 23:00:43 2013
-@@ -7449,7 +7449,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet 
+$OpenBSD: patch-src_preprocessors_Stream5_snort_stream5_tcp_c,v 1.10 2013/08/21 02:28:45 lteo Exp $
+--- src/preprocessors/Stream5/snort_stream5_tcp.c.orig	Tue Jul  9 17:33:09 2013
++++ src/preprocessors/Stream5/snort_stream5_tcp.c	Mon Aug  5 14:37:49 2013
+@@ -7495,7 +7495,7 @@ static int ProcessTcp(Stream5LWSession *lwssn, Packet 
                      char src_addr[17];
                      char dst_addr[17];
                      bzero((char *)timestamp, TIMEBUF_SIZE);
diff --git a/net/snort/patches/patch-src_preprocessors_spp_sfportscan_c b/net/snort/patches/patch-src_preprocessors_spp_sfportscan_c
index 0e705656ee3..dce8e564364 100644
--- a/net/snort/patches/patch-src_preprocessors_spp_sfportscan_c
+++ b/net/snort/patches/patch-src_preprocessors_spp_sfportscan_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_preprocessors_spp_sfportscan_c,v 1.7 2013/07/10 02:10:22 lteo Exp $
---- src/preprocessors/spp_sfportscan.c.orig	Tue Jun  4 23:19:53 2013
-+++ src/preprocessors/spp_sfportscan.c	Mon Jul  1 23:00:43 2013
-@@ -271,7 +271,7 @@ static int LogPortscanAlert(Packet *p, char *msg, uint
+$OpenBSD: patch-src_preprocessors_spp_sfportscan_c,v 1.8 2013/08/21 02:28:45 lteo Exp $
+--- src/preprocessors/spp_sfportscan.c.orig	Wed Jul  3 17:31:22 2013
++++ src/preprocessors/spp_sfportscan.c	Mon Aug  5 14:37:49 2013
+@@ -272,7 +272,7 @@ static int LogPortscanAlert(Packet *p, char *msg, uint
          return 0;
      }
  
diff --git a/net/snort/patches/patch-src_util_h b/net/snort/patches/patch-src_util_h
index 88547fa9938..5fe76750af2 100644
--- a/net/snort/patches/patch-src_util_h
+++ b/net/snort/patches/patch-src_util_h
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_util_h,v 1.5 2013/07/10 02:10:22 lteo Exp $
---- src/util.h.orig	Tue Jun  4 23:19:52 2013
-+++ src/util.h	Mon Jul  1 23:00:43 2013
+$OpenBSD: patch-src_util_h,v 1.6 2013/08/21 02:28:45 lteo Exp $
+--- src/util.h.orig	Wed Jul  3 17:31:22 2013
++++ src/util.h	Mon Aug  5 14:37:50 2013
 @@ -49,6 +49,7 @@
  #include "sflsq.h"
  #include "sfutil/sf_ipvar.h"
@@ -9,9 +9,9 @@ $OpenBSD: patch-src_util_h,v 1.5 2013/07/10 02:10:22 lteo Exp $
  
  /* Macros *********************************************************************/
  
-@@ -183,7 +184,7 @@ void StoreSnortInfoStrings(void);
+@@ -160,7 +161,7 @@ typedef struct _IntervalStats
+ void StoreSnortInfoStrings(void);
  int DisplayBanner(void);
- void GetTime(char *);
  int gmt2local(time_t);
 -void ts_print(register const struct timeval *, char *);
 +void ts_print(register const struct sf_timeval32 *, char *);
diff --git a/net/snort/pkg/PLIST b/net/snort/pkg/PLIST
index b49d10236d6..0e0d0f21953 100644
--- a/net/snort/pkg/PLIST
+++ b/net/snort/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.24 2013/07/10 02:10:22 lteo Exp $
+@comment $OpenBSD: PLIST,v 1.25 2013/08/21 02:28:45 lteo Exp $
 @pkgpath net/snort[,flexresp][,mysql][,prelude][,postgresql]
 @newgroup _snort:557
 @newuser _snort:557:_snort:daemon:Snort Account:/nonexistent:/sbin/nologin
@@ -114,7 +114,6 @@ share/doc/snort/README.variables
 share/doc/snort/TODO
 share/doc/snort/USAGE
 share/doc/snort/WISHLIST
-share/doc/snort/faq.pdf
 share/doc/snort/generators
 share/doc/snort/snort_manual.pdf
 share/examples/snort/