diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 47aecd11e24..2e5e22dbdff 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2008/12/05 21:50:57 steven Exp $
+# $OpenBSD: Makefile,v 1.12 2009/03/12 08:30:53 sthen Exp $
 
 COMMENT=	firewall GUI
 DISTNAME=	fwbuilder-3.0.2
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	net security
 
 HOMEPAGE=	http://www.fwbuilder.org/
@@ -41,9 +42,9 @@ LIB_DEPENDS=	fwcompiler.>=11,fwbuilder.>=11::security/libfwbuilder \
 NO_REGRESS=	Yes
 USE_X11=	Yes
 
-WANTLIB=	ICE SM X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender \
-		c crypto fontconfig freetype glib-2.0 gthread-2.0 iconv intl \
-		m netsnmp png pthread ssl stdc++ util xml2 xslt z
+WANTLIB += ICE SM X11 Xext Xi Xinerama Xrandr Xrender c fontconfig
+WANTLIB += freetype glib-2.0 gthread-2.0 iconv intl m netsnmp
+WANTLIB += png pthread stdc++ util xml2 xslt z
 
 post-install:
 	chown ${BINOWN}:${BINGRP} ${PREFIX}/bin/*
diff --git a/security/gringotts/Makefile b/security/gringotts/Makefile
index 06242ea5d2b..ec12ab22a3a 100644
--- a/security/gringotts/Makefile
+++ b/security/gringotts/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2008/11/18 12:51:40 landry Exp $
+# $OpenBSD: Makefile,v 1.4 2009/03/12 08:30:53 sthen Exp $
 
 COMMENT=	GTK+2 secure notes manager
 
 DISTNAME=	gringotts-1.2.9
 CATEGORIES=	security
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 
 HOMEPAGE=	http://gringotts.berlios.de/
 
@@ -16,11 +16,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
-		Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \
-		fontconfig freetype glib-2.0 glitz gmodule-2.0 \
-		gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
-		png z
+WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
+WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
+WANTLIB += z
 
 MASTER_SITES=	http://download.berlios.de/gringotts/
 
diff --git a/security/nessus/core/Makefile b/security/nessus/core/Makefile
index 3150f7f4c39..c372044da18 100644
--- a/security/nessus/core/Makefile
+++ b/security/nessus/core/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.19 2008/02/02 09:40:29 steven Exp $
+# $OpenBSD: Makefile,v 1.20 2009/03/12 08:30:53 sthen Exp $
 
 COMMENT=	network security scanner
 DISTNAME=	nessus-core-${V}
-PKGNAME=	${DISTNAME}p3
+PKGNAME=	${DISTNAME}p4
 
 FLAVORS=	no_x11
 FLAVOR?=
 
-WANTLIB=	c crypto hosts_gatherer m nessus pcap rpcsvc ssl util
+WANTLIB += c crypto hosts_gatherer m nessus pcap rpcsvc ssl util
 
 LIB_DEPENDS=	nasl.>=4::security/nessus/libnasl
 BUILD_DEPENDS=	:bison-*:devel/bison
@@ -15,10 +15,11 @@ BUILD_DEPENDS=	:bison-*:devel/bison
 .if empty(FLAVOR:L:Mno_x11)
 USE_X11=	Yes
 MODULES=	devel/gettext
-WANTLIB+=	atk-1.0 cairo.>=4 expat fontconfig freetype glib-2.0 \
-		gmodule-2.0 gobject-2.0 pango-1.0 pangocairo-1.0 \
-		pangoft2-1.0 glitz png X11 Xau Xcursor Xdmcp Xext \
-		Xcomposite Xdamage Xrender Xfixes Xi Xinerama Xrandr z
+WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig
+WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
+WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
+WANTLIB += z
 LIB_DEPENDS+=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
 CONFIGURE_ARGS+=--enable-gtk
 .else
diff --git a/security/p5-Authen-Krb5-Simple/Makefile b/security/p5-Authen-Krb5-Simple/Makefile
index b406d9cd6cf..d60c0169d64 100644
--- a/security/p5-Authen-Krb5-Simple/Makefile
+++ b/security/p5-Authen-Krb5-Simple/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2008/10/02 20:39:33 simon Exp $
+# $OpenBSD: Makefile,v 1.7 2009/03/12 08:30:53 sthen Exp $
 
 COMMENT=	Perl module to authenticate against a Kerberos server
 SHARED_ONLY=	Yes
 
 MODULES=	cpan
 DISTNAME=	Authen-Krb5-Simple-0.40
-PKGNAME=	p5-${DISTNAME}p0
+PKGNAME=	p5-${DISTNAME}p1
 CATEGORIES=	security
 
 MAINTAINER=	Stephen Kirkham <sk@openbsd.org>
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB =	crypto krb5
+WANTLIB += com_err crypto krb5
 
 CONFIGURE_ENV += KRB5_INCLUDE="/usr/include/kerberosV" \
 		 KRB5_LIB="/usr/lib"
diff --git a/security/xmlsec/Makefile b/security/xmlsec/Makefile
index fff4506e4fa..9d19025e31b 100644
--- a/security/xmlsec/Makefile
+++ b/security/xmlsec/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2008/09/15 19:10:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.18 2009/03/12 08:30:53 sthen Exp $
 
 COMMENT-main=	XML security library
 COMMENT-docs=	XML security library documentation
 
 VERSION=	1.2.11
 DISTNAME=	xmlsec1-${VERSION}
-PKGNAME-main=	xmlsec-${VERSION}
+PKGNAME-main=	xmlsec-${VERSION}p0
 PKGNAME-docs=	xmlsec-docs-${VERSION}
 CATEGORIES=	security
 SHARED_LIBS=	xmlsec1-gnutls	4.0 \
@@ -19,7 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c crypto gcrypt gpg-error m xml2 z
+
+WANTLIB += c crypto gcrypt gpg-error m tasn1 xml2 z
 
 MASTER_SITES=	http://www.aleksey.com/xmlsec/download/ \
 		ftp://ftp.aleksey.com/pub/xmlsec/releases/ \