diff --git a/devel/libhtp/Makefile b/devel/libhtp/Makefile
index dba038efa55d..341ffd13cd99 100644
--- a/devel/libhtp/Makefile
+++ b/devel/libhtp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libhtp
-PORTVERSION=	0.5.24
+PORTVERSION=	0.5.25
 CATEGORIES=	devel
 
 MAINTAINER=	koobs@FreeBSD.org
@@ -22,11 +22,7 @@ CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
 MAKE_ARGS=	LIBS="-lz ${ICONV_LIB}"
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-INSTALL_TARGET=		install-strip
-TEST_TARGET=		check
-
-CONFLICTS_INSTALL=	libhtp-suricata-*
-
-PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
+INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
 
 .include <bsd.port.mk>
diff --git a/devel/libhtp/distinfo b/devel/libhtp/distinfo
index f15944e424fb..b1a362cd8ab8 100644
--- a/devel/libhtp/distinfo
+++ b/devel/libhtp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497597987
-SHA256 (OISF-libhtp-0.5.24_GH0.tar.gz) = c959d912c54a1224711bd1b36e722714b2a2acdac094d4933ba6f1c05697d75a
-SIZE (OISF-libhtp-0.5.24_GH0.tar.gz) = 5773278
+TIMESTAMP = 1499980395
+SHA256 (OISF-libhtp-0.5.25_GH0.tar.gz) = 92eeddf923c34a97f36bce4cac2f0ae924bc0e647a6513f78fa6cc0464a73a6c
+SIZE (OISF-libhtp-0.5.25_GH0.tar.gz) = 464321
diff --git a/devel/libhtp/pkg-plist b/devel/libhtp/pkg-plist
index a1d25a43a7c1..25b250bc17a5 100644
--- a/devel/libhtp/pkg-plist
+++ b/devel/libhtp/pkg-plist
@@ -1,21 +1,21 @@
+include/htp/bstr.h
+include/htp/bstr_builder.h
+include/htp/htp.h
+include/htp/htp_base64.h
 include/htp/htp_config.h
 include/htp/htp_connection_parser.h
 include/htp/htp_core.h
+include/htp/htp_decompressors.h
+include/htp/htp_hooks.h
 include/htp/htp_list.h
+include/htp/htp_multipart.h
 include/htp/htp_table.h
 include/htp/htp_transaction.h
-include/htp/htp_version.h
-include/htp/htp_hooks.h
-include/htp/htp_decompressors.h
-include/htp/bstr.h
-include/htp/bstr_builder.h
-include/htp/htp_utf8_decoder.h
-include/htp/htp.h
-include/htp/htp_base64.h
-include/htp/htp_multipart.h
 include/htp/htp_urlencoded.h
-lib/libhtp-%%PORTVERSION%%.so.1
-lib/libhtp-%%PORTVERSION%%.so.1.0.0
+include/htp/htp_utf8_decoder.h
+include/htp/htp_version.h
 lib/libhtp.a
 lib/libhtp.so
+lib/libhtp.so.2
+lib/libhtp.so.2.0.0
 libdata/pkgconfig/htp.pc
diff --git a/security/suricata/Makefile b/security/suricata/Makefile
index 392fcab40d3f..bc424437d987 100644
--- a/security/suricata/Makefile
+++ b/security/suricata/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	suricata
 PORTVERSION=	3.2.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.openinfosecfoundation.org/download/