diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index eda624732e9e..a11e9bed3b2f 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	2.1.17
+PORTVERSION=	2.1.19
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
@@ -39,9 +39,11 @@ PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 MAN1=		fwbuilder.1 \
 		fwblookup.1 \
 		fwbedit.1 \
+		fwb_iosacl.1 \
 		fwb_ipt.1 \
 		fwb_ipf.1 \
 		fwb_ipfw.1 \
+		fwb_pix.1 \
 		fwb_pf.1
 
 .if !defined(NOPORTDOCS)
diff --git a/security/fwbuilder-devel/distinfo b/security/fwbuilder-devel/distinfo
index 4c89399e22ac..df2d3b0036c9 100644
--- a/security/fwbuilder-devel/distinfo
+++ b/security/fwbuilder-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (fwbuilder-2.1.17.tar.gz) = 6ac3e9c5663382271287df71e7a30239
-SHA256 (fwbuilder-2.1.17.tar.gz) = 45d48d1e3106cdee6ff023cd0dffbd4b17e3e7b6be32f4fc3a7c5f9f22d40b54
-SIZE (fwbuilder-2.1.17.tar.gz) = 1889486
+MD5 (fwbuilder-2.1.19.tar.gz) = 285e6f364733b6aabead143db87b309b
+SHA256 (fwbuilder-2.1.19.tar.gz) = aaa93b8e74798ce5f49007fb7ea52aa377e4d0fbcead7e57173431e966e09ce4
+SIZE (fwbuilder-2.1.19.tar.gz) = 1970471
diff --git a/security/fwbuilder-devel/pkg-plist b/security/fwbuilder-devel/pkg-plist
index 2fcfe330e834..e83ba57a447a 100644
--- a/security/fwbuilder-devel/pkg-plist
+++ b/security/fwbuilder-devel/pkg-plist
@@ -1,7 +1,9 @@
+bin/fwb_iosacl
 bin/fwb_ipf
 bin/fwb_ipfw
 bin/fwb_ipt
 bin/fwb_pf
+bin/fwb_pix
 bin/fwbedit
 bin/fwblookup
 bin/fwbuilder
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index eda624732e9e..a11e9bed3b2f 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	2.1.17
+PORTVERSION=	2.1.19
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
@@ -39,9 +39,11 @@ PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 MAN1=		fwbuilder.1 \
 		fwblookup.1 \
 		fwbedit.1 \
+		fwb_iosacl.1 \
 		fwb_ipt.1 \
 		fwb_ipf.1 \
 		fwb_ipfw.1 \
+		fwb_pix.1 \
 		fwb_pf.1
 
 .if !defined(NOPORTDOCS)
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index 4c89399e22ac..df2d3b0036c9 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1,3 +1,3 @@
-MD5 (fwbuilder-2.1.17.tar.gz) = 6ac3e9c5663382271287df71e7a30239
-SHA256 (fwbuilder-2.1.17.tar.gz) = 45d48d1e3106cdee6ff023cd0dffbd4b17e3e7b6be32f4fc3a7c5f9f22d40b54
-SIZE (fwbuilder-2.1.17.tar.gz) = 1889486
+MD5 (fwbuilder-2.1.19.tar.gz) = 285e6f364733b6aabead143db87b309b
+SHA256 (fwbuilder-2.1.19.tar.gz) = aaa93b8e74798ce5f49007fb7ea52aa377e4d0fbcead7e57173431e966e09ce4
+SIZE (fwbuilder-2.1.19.tar.gz) = 1970471
diff --git a/security/fwbuilder/pkg-plist b/security/fwbuilder/pkg-plist
index 2fcfe330e834..e83ba57a447a 100644
--- a/security/fwbuilder/pkg-plist
+++ b/security/fwbuilder/pkg-plist
@@ -1,7 +1,9 @@
+bin/fwb_iosacl
 bin/fwb_ipf
 bin/fwb_ipfw
 bin/fwb_ipt
 bin/fwb_pf
+bin/fwb_pix
 bin/fwbedit
 bin/fwblookup
 bin/fwbuilder
diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile
index eda624732e9e..a11e9bed3b2f 100644
--- a/security/fwbuilder2/Makefile
+++ b/security/fwbuilder2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	2.1.17
+PORTVERSION=	2.1.19
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
@@ -39,9 +39,11 @@ PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 MAN1=		fwbuilder.1 \
 		fwblookup.1 \
 		fwbedit.1 \
+		fwb_iosacl.1 \
 		fwb_ipt.1 \
 		fwb_ipf.1 \
 		fwb_ipfw.1 \
+		fwb_pix.1 \
 		fwb_pf.1
 
 .if !defined(NOPORTDOCS)
diff --git a/security/fwbuilder2/distinfo b/security/fwbuilder2/distinfo
index 4c89399e22ac..df2d3b0036c9 100644
--- a/security/fwbuilder2/distinfo
+++ b/security/fwbuilder2/distinfo
@@ -1,3 +1,3 @@
-MD5 (fwbuilder-2.1.17.tar.gz) = 6ac3e9c5663382271287df71e7a30239
-SHA256 (fwbuilder-2.1.17.tar.gz) = 45d48d1e3106cdee6ff023cd0dffbd4b17e3e7b6be32f4fc3a7c5f9f22d40b54
-SIZE (fwbuilder-2.1.17.tar.gz) = 1889486
+MD5 (fwbuilder-2.1.19.tar.gz) = 285e6f364733b6aabead143db87b309b
+SHA256 (fwbuilder-2.1.19.tar.gz) = aaa93b8e74798ce5f49007fb7ea52aa377e4d0fbcead7e57173431e966e09ce4
+SIZE (fwbuilder-2.1.19.tar.gz) = 1970471
diff --git a/security/fwbuilder2/pkg-plist b/security/fwbuilder2/pkg-plist
index 2fcfe330e834..e83ba57a447a 100644
--- a/security/fwbuilder2/pkg-plist
+++ b/security/fwbuilder2/pkg-plist
@@ -1,7 +1,9 @@
+bin/fwb_iosacl
 bin/fwb_ipf
 bin/fwb_ipfw
 bin/fwb_ipt
 bin/fwb_pf
+bin/fwb_pix
 bin/fwbedit
 bin/fwblookup
 bin/fwbuilder
diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile
index 7906375fd096..7108d55df22c 100644
--- a/security/libfwbuilder-devel/Makefile
+++ b/security/libfwbuilder-devel/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	libfwbuilder
-PORTVERSION=	2.1.17
+PORTVERSION=	2.1.19
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fwbuilder
diff --git a/security/libfwbuilder-devel/distinfo b/security/libfwbuilder-devel/distinfo
index 4a2d45a1a494..fd0e0f95ce92 100644
--- a/security/libfwbuilder-devel/distinfo
+++ b/security/libfwbuilder-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (libfwbuilder-2.1.17.tar.gz) = 94b4a0e8ff8da642726c8b103362956e
-SHA256 (libfwbuilder-2.1.17.tar.gz) = 3bbbddb5f5e580bd5c5aa0189b54b71677b981fe0e33f1ec55914b5d9e70b829
-SIZE (libfwbuilder-2.1.17.tar.gz) = 318061
+MD5 (libfwbuilder-2.1.19.tar.gz) = 47f828e91067e80e2dc91a316e762eac
+SHA256 (libfwbuilder-2.1.19.tar.gz) = c573c30420eaedaae1849d446c1d44eca1f8a0d8133f3e88f4b6379552c095c3
+SIZE (libfwbuilder-2.1.19.tar.gz) = 318718
diff --git a/security/libfwbuilder-devel/pkg-plist b/security/libfwbuilder-devel/pkg-plist
index 093ed2e8d537..178f56e10202 100644
--- a/security/libfwbuilder-devel/pkg-plist
+++ b/security/libfwbuilder-devel/pkg-plist
@@ -123,6 +123,8 @@ share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.13.xslt
 share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.14.xslt
 share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.15.xslt
 share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.16.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.17.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.18.xslt
 share/libfwbuilder%%BUILD_VERSION%%/fwbuilder.dtd
 @dirrm share/libfwbuilder%%BUILD_VERSION%%/migration
 @dirrm share/libfwbuilder%%BUILD_VERSION%%
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index 7906375fd096..7108d55df22c 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	libfwbuilder
-PORTVERSION=	2.1.17
+PORTVERSION=	2.1.19
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fwbuilder
diff --git a/security/libfwbuilder/distinfo b/security/libfwbuilder/distinfo
index 4a2d45a1a494..fd0e0f95ce92 100644
--- a/security/libfwbuilder/distinfo
+++ b/security/libfwbuilder/distinfo
@@ -1,3 +1,3 @@
-MD5 (libfwbuilder-2.1.17.tar.gz) = 94b4a0e8ff8da642726c8b103362956e
-SHA256 (libfwbuilder-2.1.17.tar.gz) = 3bbbddb5f5e580bd5c5aa0189b54b71677b981fe0e33f1ec55914b5d9e70b829
-SIZE (libfwbuilder-2.1.17.tar.gz) = 318061
+MD5 (libfwbuilder-2.1.19.tar.gz) = 47f828e91067e80e2dc91a316e762eac
+SHA256 (libfwbuilder-2.1.19.tar.gz) = c573c30420eaedaae1849d446c1d44eca1f8a0d8133f3e88f4b6379552c095c3
+SIZE (libfwbuilder-2.1.19.tar.gz) = 318718
diff --git a/security/libfwbuilder/pkg-plist b/security/libfwbuilder/pkg-plist
index 093ed2e8d537..178f56e10202 100644
--- a/security/libfwbuilder/pkg-plist
+++ b/security/libfwbuilder/pkg-plist
@@ -123,6 +123,8 @@ share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.13.xslt
 share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.14.xslt
 share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.15.xslt
 share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.16.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.17.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.18.xslt
 share/libfwbuilder%%BUILD_VERSION%%/fwbuilder.dtd
 @dirrm share/libfwbuilder%%BUILD_VERSION%%/migration
 @dirrm share/libfwbuilder%%BUILD_VERSION%%
diff --git a/security/libfwbuilder2/Makefile b/security/libfwbuilder2/Makefile
index 7906375fd096..7108d55df22c 100644
--- a/security/libfwbuilder2/Makefile
+++ b/security/libfwbuilder2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	libfwbuilder
-PORTVERSION=	2.1.17
+PORTVERSION=	2.1.19
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fwbuilder
diff --git a/security/libfwbuilder2/distinfo b/security/libfwbuilder2/distinfo
index 4a2d45a1a494..fd0e0f95ce92 100644
--- a/security/libfwbuilder2/distinfo
+++ b/security/libfwbuilder2/distinfo
@@ -1,3 +1,3 @@
-MD5 (libfwbuilder-2.1.17.tar.gz) = 94b4a0e8ff8da642726c8b103362956e
-SHA256 (libfwbuilder-2.1.17.tar.gz) = 3bbbddb5f5e580bd5c5aa0189b54b71677b981fe0e33f1ec55914b5d9e70b829
-SIZE (libfwbuilder-2.1.17.tar.gz) = 318061
+MD5 (libfwbuilder-2.1.19.tar.gz) = 47f828e91067e80e2dc91a316e762eac
+SHA256 (libfwbuilder-2.1.19.tar.gz) = c573c30420eaedaae1849d446c1d44eca1f8a0d8133f3e88f4b6379552c095c3
+SIZE (libfwbuilder-2.1.19.tar.gz) = 318718
diff --git a/security/libfwbuilder2/pkg-plist b/security/libfwbuilder2/pkg-plist
index 093ed2e8d537..178f56e10202 100644
--- a/security/libfwbuilder2/pkg-plist
+++ b/security/libfwbuilder2/pkg-plist
@@ -123,6 +123,8 @@ share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.13.xslt
 share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.14.xslt
 share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.15.xslt
 share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.16.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.17.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.18.xslt
 share/libfwbuilder%%BUILD_VERSION%%/fwbuilder.dtd
 @dirrm share/libfwbuilder%%BUILD_VERSION%%/migration
 @dirrm share/libfwbuilder%%BUILD_VERSION%%