diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index b64d4d4fc46e..e629c5c3d95a 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fwbuilder
-DISTVERSION=	4.0.0
+DISTVERSION=	4.0.1
 PORTVERSION=	${DISTVERSION}
 CATEGORIES=	security
 .if defined(BUILD)
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index 550a9499125c..931a934eba1b 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1,3 +1,3 @@
-MD5 (fwbuilder-4.0.0.tar.gz) = 6dc634525de9c04f5b062171220586cb
-SHA256 (fwbuilder-4.0.0.tar.gz) = f66e9565e2e681c0516cfbd961185f0c1b8be3abf385fa942b38c1e63c845027
-SIZE (fwbuilder-4.0.0.tar.gz) = 5468879
+MD5 (fwbuilder-4.0.1.tar.gz) = 684f00944ee1bc9da9a8fd4a774c5eb0
+SHA256 (fwbuilder-4.0.1.tar.gz) = 208cce7e304b66efe5b6c7c8fa100b573f66180b006ee84ce8c83a0781dc2904
+SIZE (fwbuilder-4.0.1.tar.gz) = 5528377
diff --git a/security/fwbuilder/pkg-plist b/security/fwbuilder/pkg-plist
index 30f37df7cb78..bb94673a24f2 100644
--- a/security/fwbuilder/pkg-plist
+++ b/security/fwbuilder/pkg-plist
@@ -6,6 +6,7 @@ bin/fwb_pf
 bin/fwb_pix
 bin/fwbedit
 bin/fwbuilder
+bin/fwb_procurve_acl
 bin/transfer_secuwall
 share/applications/fwbuilder.desktop
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/carp_interface
@@ -32,6 +33,7 @@ share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd/tools
 share/fwbuilder-%%BUILD_VERSION%%/configlets/ios/installer_commands_post_config
 share/fwbuilder-%%BUILD_VERSION%%/configlets/ios/installer_commands_pre_config
 share/fwbuilder-%%BUILD_VERSION%%/configlets/ios/installer_commands_reg_user
+share/fwbuilder-%%BUILD_VERSION%%/configlets/ios/safety_net_acl
 share/fwbuilder-%%BUILD_VERSION%%/configlets/ios/script_skeleton
 share/fwbuilder-%%BUILD_VERSION%%/configlets/ios/top_comment
 share/fwbuilder-%%BUILD_VERSION%%/configlets/ipcop/automatic_rules
@@ -109,6 +111,12 @@ share/fwbuilder-%%BUILD_VERSION%%/configlets/pix_os/vlan_parent_interface_6
 share/fwbuilder-%%BUILD_VERSION%%/configlets/pix_os/vlan_parent_interface_7
 share/fwbuilder-%%BUILD_VERSION%%/configlets/pix_os/vlan_subinterface_6
 share/fwbuilder-%%BUILD_VERSION%%/configlets/pix_os/vlan_subinterface_7
+share/fwbuilder-%%BUILD_VERSION%%/configlets/procurve/installer_commands_post_config
+share/fwbuilder-%%BUILD_VERSION%%/configlets/procurve/installer_commands_pre_config
+share/fwbuilder-%%BUILD_VERSION%%/configlets/procurve/installer_commands_reg_user
+share/fwbuilder-%%BUILD_VERSION%%/configlets/procurve/safety_net_acl
+share/fwbuilder-%%BUILD_VERSION%%/configlets/procurve/script_skeleton
+share/fwbuilder-%%BUILD_VERSION%%/configlets/procurve/top_comment
 share/fwbuilder-%%BUILD_VERSION%%/configlets/secuwall/installer_commands_reg_user
 share/fwbuilder-%%BUILD_VERSION%%/configlets/secuwall/installer_commands_root
 share/fwbuilder-%%BUILD_VERSION%%/configlets/secuwall/management_rules
@@ -176,6 +184,7 @@ share/fwbuilder-%%BUILD_VERSION%%/os/oneshield.xml
 share/fwbuilder-%%BUILD_VERSION%%/os/openbsd.xml
 share/fwbuilder-%%BUILD_VERSION%%/os/openwrt.xml
 share/fwbuilder-%%BUILD_VERSION%%/os/pix_os.xml
+share/fwbuilder-%%BUILD_VERSION%%/os/procurve.xml
 share/fwbuilder-%%BUILD_VERSION%%/os/secuwall.xml
 share/fwbuilder-%%BUILD_VERSION%%/os/solaris.xml
 share/fwbuilder-%%BUILD_VERSION%%/os/sveasoft.xml
@@ -187,6 +196,7 @@ share/fwbuilder-%%BUILD_VERSION%%/platform/ipfw.xml
 share/fwbuilder-%%BUILD_VERSION%%/platform/iptables.xml
 share/fwbuilder-%%BUILD_VERSION%%/platform/pf.xml
 share/fwbuilder-%%BUILD_VERSION%%/platform/pix.xml
+share/fwbuilder-%%BUILD_VERSION%%/platform/procurve_acl.xml
 share/fwbuilder-%%BUILD_VERSION%%/platform/unknown.xml
 share/fwbuilder-%%BUILD_VERSION%%/resources.xml
 share/fwbuilder-%%BUILD_VERSION%%/templates.xml
@@ -198,6 +208,7 @@ share/fwbuilder-%%BUILD_VERSION%%/templates.xml
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/sveasoft
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/solaris
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/secuwall
+@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/procurve
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/pix_os
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/pf
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/openwrt
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index b2f76e5f4a47..bdffef61c1fb 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	libfwbuilder
-DISTVERSION=	4.0.0
+DISTVERSION=	4.0.1
 PORTVERSION=	${DISTVERSION}
 CATEGORIES=	security
 .if defined(BUILD)
diff --git a/security/libfwbuilder/distinfo b/security/libfwbuilder/distinfo
index 101ef5514066..9e7ba0326ea8 100644
--- a/security/libfwbuilder/distinfo
+++ b/security/libfwbuilder/distinfo
@@ -1,3 +1,3 @@
-MD5 (libfwbuilder-4.0.0.tar.gz) = d1393097e63af886c849f3da7d9f1bce
-SHA256 (libfwbuilder-4.0.0.tar.gz) = 33fb19004717c4619927b4d165f4f5d2cd949d23f3cbc96b8ab045e6e4bd3dbb
-SIZE (libfwbuilder-4.0.0.tar.gz) = 375988
+MD5 (libfwbuilder-4.0.1.tar.gz) = 434f2c222a9b1656c1adc14315cd578e
+SHA256 (libfwbuilder-4.0.1.tar.gz) = 877723f464f08fab25ed72941a02ccff1b618a6f1d9d7fb63ebb20e136e090a6
+SIZE (libfwbuilder-4.0.1.tar.gz) = 376739