diff --git a/security/ossec-hids-client/pkg-plist.client b/security/ossec-hids-client/pkg-plist.client
index 0cfbeef2d866..a5a93a03ea82 100644
--- a/security/ossec-hids-client/pkg-plist.client
+++ b/security/ossec-hids-client/pkg-plist.client
@@ -7,6 +7,7 @@
 %%PORTNAME%%/active-response/bin/pf.sh
 %%PORTNAME%%/active-response/bin/restart-ossec.sh
 %%PORTNAME%%/active-response/bin/route-null.sh
+%%PORTNAME%%/bin/agent-auth
 %%PORTNAME%%/bin/manage_agents
 %%PORTNAME%%/bin/ossec-agentd
 %%PORTNAME%%/bin/ossec-control
diff --git a/security/ossec-hids-server/Makefile b/security/ossec-hids-server/Makefile
index 2461ce3c3236..f9ba517d6d89 100644
--- a/security/ossec-hids-server/Makefile
+++ b/security/ossec-hids-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ossec-hids
-PORTVERSION=	2.5.1
-PORTREVISION=	1
+PORTVERSION=	2.6
 CATEGORIES=	security
 MASTER_SITES=	http://www.ossec.net/files/ \
 		http://www.ossec.net/files/old/
@@ -18,10 +17,10 @@ COMMENT?=	A security tool to monitor and check logs and intrusions
 
 USE_RC_SUBR=	ossec-hids
 
-.if defined(WITH_DB)
-USE_MYSQL=	yes
-USE_PGSQL=	yes
-USE_BDB=	yes
+.if !defined(CLIENT_ONLY)
+OPTIONS=	MYSQL "Enable MySQL support" off \
+		PGSQL "Enable PostgreSQL support" off \
+		BDB "Enable with Berkeley DB" off
 .endif
 
 SUB_LIST=	PORTNAME=${PORTNAME}
@@ -31,6 +30,23 @@ PORTDOCS=	BUGS CONFIG CONTRIBUTORS INSTALL LICENSE README
 
 .include <bsd.port.pre.mk>
 
+.if !defined(CLIENT_ONLY)
+.if defined(WITH_MYSQL)
+WITH_DB=	yes
+USE_MYSQL=	yes
+.endif
+
+.if defined(WITH_PGSQL)
+WITH_DB=	yes
+USE_PGSQL=	yes
+.endif
+
+.if defined(WITH_BDB)
+WITH_DB=	yes
+USE_BDB=	yes
+.endif
+.endif
+
 .if defined(CLIENT_ONLY)
 PKGNAMESUFFIX=	-client
 CONFLICTS=	ossec-hids-server-[0-9]* ossec-hids-local-[0-9]*
diff --git a/security/ossec-hids-server/distinfo b/security/ossec-hids-server/distinfo
index d9acfd8bf9b6..fc4670eeefe7 100644
--- a/security/ossec-hids-server/distinfo
+++ b/security/ossec-hids-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ossec-hids-2.5.1.tar.gz) = e7bb4701a6b9a40f76d4e2c3c39106ded3c37f13ccc3ce476029da1f0e9c9f9e
-SIZE (ossec-hids-2.5.1.tar.gz) = 740470
+SHA256 (ossec-hids-2.6.tar.gz) = 37a6b14a0c41252852b51fd06cc186a8b66bd9e01821efd70305a6dd782a2b4c
+SIZE (ossec-hids-2.6.tar.gz) = 758125
diff --git a/security/ossec-hids-server/pkg-plist b/security/ossec-hids-server/pkg-plist
index bd6e9b031259..db7f5982151f 100644
--- a/security/ossec-hids-server/pkg-plist
+++ b/security/ossec-hids-server/pkg-plist
@@ -14,6 +14,7 @@
 %%PORTNAME%%/bin/ossec-agentd
 %%PORTNAME%%/bin/ossec-agentlessd
 %%PORTNAME%%/bin/ossec-analysisd
+%%PORTNAME%%/bin/ossec-authd
 %%PORTNAME%%/bin/ossec-control
 %%PORTNAME%%/bin/ossec-csyslogd
 %%PORTNAME%%/bin/ossec-dbd
@@ -49,10 +50,13 @@
 %%PORTNAME%%/rules/arpwatch_rules.xml
 %%PORTNAME%%/rules/asterisk_rules.xml
 %%PORTNAME%%/rules/attack_rules.xml
+%%PORTNAME%%/rules/bro-ids_rules.xml
 %%PORTNAME%%/rules/cimserver_rules.xml
 %%PORTNAME%%/rules/cisco-ios_rules.xml
+%%PORTNAME%%/rules/clam_av_rules.xml
 %%PORTNAME%%/rules/courier_rules.xml
 %%PORTNAME%%/rules/dovecot_rules.xml
+%%PORTNAME%%/rules/dropbear_rules.xml
 %%PORTNAME%%/rules/firewall_rules.xml
 %%PORTNAME%%/rules/ftpd_rules.xml
 %%PORTNAME%%/rules/hordeimp_rules.xml
@@ -70,6 +74,7 @@
 %%PORTNAME%%/rules/named_rules.xml
 %%PORTNAME%%/rules/netscreenfw_rules.xml
 %%PORTNAME%%/rules/nginx_rules.xml
+%%PORTNAME%%/rules/openbsd_rules.xml
 %%PORTNAME%%/rules/ossec_rules.xml
 %%PORTNAME%%/rules/pam_rules.xml
 %%PORTNAME%%/rules/php_rules.xml