diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index bf6799039db..7d771e48928 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2005/05/26 21:18:47 naddy Exp $
+# $OpenBSD: Makefile,v 1.3 2006/04/17 14:46:09 espie Exp $
 
 COMMENT='firewall gui'
 CATEGORIES=net security
@@ -11,15 +11,16 @@ PERMIT_DISTFILES_CDROM=	Yes
 HOMEPAGE=http://www.fwbuilder.org/
 
 MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
-DISTNAME=fwbuilder-2.0.7
-PKGNAME=${DISTNAME}p0
-CONFIGURE_STYLE=gnu
+DISTNAME=	fwbuilder-2.0.12
+PKGNAME=	${DISTNAME}
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS+=	--with-docdir=${TRUEPREFIX}/share/doc/fwbuilder
 
-MODULES=x11/qt3
-FAKE_FLAGS=INSTALL_ROOT=${WRKINST} ${MAKE_FLAGS}
-LIB_DEPENDS=fwcompiler,fwbuilder::security/libfwbuilder
-NO_REGRESS=Yes
+MODULES=	x11/qt3
+FAKE_FLAGS=	INSTALL_ROOT=${WRKINST} ${MAKE_FLAGS}
+LIB_DEPENDS=	fwcompiler.8,fwbuilder.8::security/libfwbuilder
+NO_REGRESS=	Yes
 
-WANTLIB=stdc++ c util m X11 ssl z crypto Xext pthread iconv xslt xml2 netsnmp
+WANTLIB=	stdc++ c util m X11 ssl z crypto Xext pthread iconv xslt xml2 netsnmp
 
 .include <bsd.port.mk>
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index e8bb19cc513..6721a25d087 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1,4 +1,4 @@
-MD5 (fwbuilder-2.0.7.tar.gz) = e381567247165bb4a8a9a130d3abe446
-RMD160 (fwbuilder-2.0.7.tar.gz) = 5785a11655474a264d143e82d0a227424cd2a715
-SHA1 (fwbuilder-2.0.7.tar.gz) = b1356d5f432315684ba6fa88d3e6bf325ba3558f
-SIZE (fwbuilder-2.0.7.tar.gz) = 1222857
+MD5 (fwbuilder-2.0.12.tar.gz) = 43149297f4a64b19ad3fa519cfff2326
+RMD160 (fwbuilder-2.0.12.tar.gz) = 7d3ae613ac015650333d2e9f980c8d688e320cd2
+SHA1 (fwbuilder-2.0.12.tar.gz) = 5947236e365ef085ebebd4fec85935cb99b9b64c
+SIZE (fwbuilder-2.0.12.tar.gz) = 1389953
diff --git a/security/fwbuilder/patches/patch-qmake_inc_in b/security/fwbuilder/patches/patch-qmake_inc_in
index ec3151b05ba..8d3d6bc76d5 100644
--- a/security/fwbuilder/patches/patch-qmake_inc_in
+++ b/security/fwbuilder/patches/patch-qmake_inc_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-qmake_inc_in,v 1.1.1.1 2005/05/21 09:37:35 espie Exp $
---- qmake.inc.in.orig	Thu May 19 14:40:36 2005
-+++ qmake.inc.in	Thu May 19 14:41:00 2005
+$OpenBSD: patch-qmake_inc_in,v 1.2 2006/04/17 14:46:09 espie Exp $
+--- qmake.inc.in.orig	Tue Oct 25 08:11:26 2005
++++ qmake.inc.in	Mon Apr 17 14:40:39 2006
 @@ -27,7 +27,7 @@ unix {
  	res_os.path             = $(DDIR)@RES_DIR@/os
  	res_platform.path       = $(DDIR)@RES_DIR@/platform
@@ -9,4 +9,4 @@ $OpenBSD: patch-qmake_inc_in,v 1.1.1.1 2005/05/21 09:37:35 espie Exp $
 +	CONFIG                 += qt thread rtti stl warn_on release
  	INCLUDEPATH            += @LIBFWBUILDER_INCLUDEPATH@
  
- 	LIBS                   += $$LIBS_FWBUILDER
+ 	LIBS                   += $$LIBS_FWBUILDER @LIBS@
diff --git a/security/fwbuilder/pkg/PLIST b/security/fwbuilder/pkg/PLIST
index 696c8727584..a4759cd9404 100644
--- a/security/fwbuilder/pkg/PLIST
+++ b/security/fwbuilder/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/05/21 09:37:35 espie Exp $
+@comment $OpenBSD: PLIST,v 1.2 2006/04/17 14:46:09 espie Exp $
 bin/fwb_compile_all
 bin/fwb_install
 bin/fwb_ipf
@@ -17,42 +17,52 @@ bin/fwbuilder
 @man man/man1/fwbedit.1
 @man man/man1/fwblookup.1
 @man man/man1/fwbuilder.1
-share/doc/fwbuilder-2.0.7/
-share/doc/fwbuilder-2.0.7/AUTHORS
-share/doc/fwbuilder-2.0.7/COPYING
-share/doc/fwbuilder-2.0.7/ChangeLog
-share/doc/fwbuilder-2.0.7/Credits
-share/doc/fwbuilder-2.0.7/PatchAcceptancePolicy.txt
-share/doc/fwbuilder-2.0.7/README.floppyfw
-share/doc/fwbuilder-2.0.7/README.ipf
-share/doc/fwbuilder-2.0.7/README.ipfw
-share/doc/fwbuilder-2.0.7/README.ipt
-share/doc/fwbuilder-2.0.7/README.pf
-share/doc/fwbuilder-2.0.7/ReleaseNotes_2.0.1.html
-share/doc/fwbuilder-2.0.7/ReleaseNotes_2.0.1.txt
-share/doc/fwbuilder-2.0.7/ReleaseNotes_2.0.2.html
-share/doc/fwbuilder-2.0.7/ReleaseNotes_2.0.2.txt
-share/doc/fwbuilder-2.0.7/ReleaseNotes_2.0.3.html
-share/doc/fwbuilder-2.0.7/ReleaseNotes_2.0.3.txt
-share/doc/fwbuilder-2.0.7/ReleaseNotes_2.0.4.html
-share/doc/fwbuilder-2.0.7/ReleaseNotes_2.0.4.txt
-share/doc/fwbuilder-2.0.7/ReleaseNotes_2.0.5.html
-share/doc/fwbuilder-2.0.7/ReleaseNotes_2.0.5.txt
-share/doc/fwbuilder-2.0.7/ReleaseNotes_2.0.6.html
-share/doc/fwbuilder-2.0.7/ReleaseNotes_2.0.6.txt
-share/doc/fwbuilder-2.0.7/ReleaseNotes_2.0.7.html
-share/doc/fwbuilder-2.0.7/ReleaseNotes_2.0.7.txt
-share/doc/fwbuilder-2.0.7/ReleaseNotes_2_0.html
-share/doc/fwbuilder-2.0.7/ReleaseNotes_2_0.txt
+share/doc/fwbuilder/
+share/doc/fwbuilder/AUTHORS
+share/doc/fwbuilder/COPYING
+share/doc/fwbuilder/ChangeLog
+share/doc/fwbuilder/Credits
+share/doc/fwbuilder/PatchAcceptancePolicy.txt
+share/doc/fwbuilder/README.floppyfw
+share/doc/fwbuilder/README.ipf
+share/doc/fwbuilder/README.ipfw
+share/doc/fwbuilder/README.ipt
+share/doc/fwbuilder/README.pf
+share/doc/fwbuilder/ReleaseNotes_2.0.1.html
+share/doc/fwbuilder/ReleaseNotes_2.0.1.txt
+share/doc/fwbuilder/ReleaseNotes_2.0.10.html
+share/doc/fwbuilder/ReleaseNotes_2.0.10.txt
+share/doc/fwbuilder/ReleaseNotes_2.0.11.html
+share/doc/fwbuilder/ReleaseNotes_2.0.11.txt
+share/doc/fwbuilder/ReleaseNotes_2.0.2.html
+share/doc/fwbuilder/ReleaseNotes_2.0.2.txt
+share/doc/fwbuilder/ReleaseNotes_2.0.3.html
+share/doc/fwbuilder/ReleaseNotes_2.0.3.txt
+share/doc/fwbuilder/ReleaseNotes_2.0.4.html
+share/doc/fwbuilder/ReleaseNotes_2.0.4.txt
+share/doc/fwbuilder/ReleaseNotes_2.0.5.html
+share/doc/fwbuilder/ReleaseNotes_2.0.5.txt
+share/doc/fwbuilder/ReleaseNotes_2.0.6.html
+share/doc/fwbuilder/ReleaseNotes_2.0.6.txt
+share/doc/fwbuilder/ReleaseNotes_2.0.7.html
+share/doc/fwbuilder/ReleaseNotes_2.0.7.txt
+share/doc/fwbuilder/ReleaseNotes_2.0.8.html
+share/doc/fwbuilder/ReleaseNotes_2.0.8.txt
+share/doc/fwbuilder/ReleaseNotes_2.0.9.html
+share/doc/fwbuilder/ReleaseNotes_2.0.9.txt
+share/doc/fwbuilder/ReleaseNotes_2_0.html
+share/doc/fwbuilder/ReleaseNotes_2_0.txt
 share/fwbuilder/
 share/fwbuilder/locale/
 share/fwbuilder/locale/fwbuilder_de.qm
+share/fwbuilder/locale/fwbuilder_es.qm
 share/fwbuilder/locale/fwbuilder_fr.qm
 share/fwbuilder/locale/fwbuilder_ja.qm
 share/fwbuilder/locale/fwbuilder_ru.qm
 share/fwbuilder/objects_init.xml
 share/fwbuilder/os/
 share/fwbuilder/os/freebsd.xml
+share/fwbuilder/os/fwsm_os.xml
 share/fwbuilder/os/linksys.xml
 share/fwbuilder/os/linux24.xml
 share/fwbuilder/os/macosx.xml
@@ -61,6 +71,7 @@ share/fwbuilder/os/pix_os.xml
 share/fwbuilder/os/solaris.xml
 share/fwbuilder/os/unknown_os.xml
 share/fwbuilder/platform/
+share/fwbuilder/platform/fwsm.xml
 share/fwbuilder/platform/ipf.xml
 share/fwbuilder/platform/ipfw.xml
 share/fwbuilder/platform/iptables.xml
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index a937e958a32..7546a0af4d6 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2006/01/14 11:46:15 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2006/04/17 14:46:08 espie Exp $
 
 COMMENT=	'libraries for fwbuilder'
-DISTNAME=	libfwbuilder-2.0.7
-PKGNAME=	$(DISTNAME)p0
+DISTNAME=	libfwbuilder-2.0.12
+PKGNAME=	$(DISTNAME)
 CATEGORIES=	net security
-SHARED_LIBS=	fwbuilder	7.0 \
-		fwcompiler	7.0
+SHARED_LIBS=	fwbuilder	8.0 \
+		fwcompiler	8.0
 
 HOMEPAGE=	http://www.fwbuilder.org/
 
@@ -24,6 +24,7 @@ LIB_DEPENDS+=	xslt::textproc/libxslt \
 	    	netsnmp::net/net-snmp
 
 CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS+=	--with-docdir=${TRUEPREFIX}/share/doc/libfwbuilder
 
 NO_REGRESS=	Yes
 
diff --git a/security/libfwbuilder/distinfo b/security/libfwbuilder/distinfo
index f813adb2c78..01c0e28e0ef 100644
--- a/security/libfwbuilder/distinfo
+++ b/security/libfwbuilder/distinfo
@@ -1,4 +1,4 @@
-MD5 (libfwbuilder-2.0.7.tar.gz) = bf2c35710ee69380754a1c1a0fb81551
-RMD160 (libfwbuilder-2.0.7.tar.gz) = 2addd11c605b1415b14c5a0c8eefba2c4ad7207f
-SHA1 (libfwbuilder-2.0.7.tar.gz) = 652102bd05ecc8ee9a5712de45fe48398e35f57b
-SIZE (libfwbuilder-2.0.7.tar.gz) = 281340
+MD5 (libfwbuilder-2.0.12.tar.gz) = 09834a242ad0f8aaae80c44ee4937c43
+RMD160 (libfwbuilder-2.0.12.tar.gz) = 69f996659d30863e97340c52d814469a8e5173b7
+SHA1 (libfwbuilder-2.0.12.tar.gz) = a287de04e81a4ee480d34e8f209718eb63da457a
+SIZE (libfwbuilder-2.0.12.tar.gz) = 282065
diff --git a/security/libfwbuilder/pkg/PLIST b/security/libfwbuilder/pkg/PLIST
index 662cdff8bb1..426d755222d 100644
--- a/security/libfwbuilder/pkg/PLIST
+++ b/security/libfwbuilder/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/05/21 09:35:19 espie Exp $
+@comment $OpenBSD: PLIST,v 1.2 2006/04/17 14:46:09 espie Exp $
 %%SHARED%%
 bin/libfwbuilder-config-2
 include/fwb-2.0/
@@ -60,13 +60,13 @@ include/fwb-2.0/fwcompiler/NATCompiler.h
 include/fwb-2.0/fwcompiler/OSConfigurator.h
 include/fwb-2.0/fwcompiler/PolicyCompiler.h
 include/fwb-2.0/fwcompiler/RuleProcessor.h
-share/doc/libfwbuilder-2.0.7/
-share/doc/libfwbuilder-2.0.7/AUTHORS
-share/doc/libfwbuilder-2.0.7/COPYING
-share/doc/libfwbuilder-2.0.7/ChangeLog
-share/doc/libfwbuilder-2.0.7/Credits
-share/doc/libfwbuilder-2.0.7/INSTALL
-share/doc/libfwbuilder-2.0.7/PatchAcceptancePolicy.txt
+share/doc/libfwbuilder/
+share/doc/libfwbuilder/AUTHORS
+share/doc/libfwbuilder/COPYING
+share/doc/libfwbuilder/ChangeLog
+share/doc/libfwbuilder/Credits
+share/doc/libfwbuilder/INSTALL
+share/doc/libfwbuilder/PatchAcceptancePolicy.txt
 share/libfwbuilder/
 share/libfwbuilder/fwbuilder.dtd
 share/libfwbuilder/migration/
@@ -97,8 +97,13 @@ share/libfwbuilder/migration/FWObjectDatabase_1.0.1.xslt
 share/libfwbuilder/migration/FWObjectDatabase_1.0.2.xslt
 share/libfwbuilder/migration/FWObjectDatabase_2.0.0.xslt
 share/libfwbuilder/migration/FWObjectDatabase_2.0.1.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.10.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.11.xslt
 share/libfwbuilder/migration/FWObjectDatabase_2.0.2.xslt
 share/libfwbuilder/migration/FWObjectDatabase_2.0.3.xslt
 share/libfwbuilder/migration/FWObjectDatabase_2.0.4.xslt
 share/libfwbuilder/migration/FWObjectDatabase_2.0.5.xslt
 share/libfwbuilder/migration/FWObjectDatabase_2.0.6.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.7.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.8.xslt
+share/libfwbuilder/migration/FWObjectDatabase_2.0.9.xslt