diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile
index 0d9903a39402..ae81f3ce0cc3 100644
--- a/security/libfwbuilder-devel/Makefile
+++ b/security/libfwbuilder-devel/Makefile
@@ -5,22 +5,34 @@
 # $FreeBSD$
 
 PORTNAME=	libfwbuilder
-PORTVERSION=	3.0.7
+DISTVERSION=	4.0.0
+PORTVERSION=	${DISTVERSION}
+BUILD=		2877
 CATEGORIES=	security
+
 .if defined(BUILD)
-MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-3.0/build-${BUILD}/
+MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-4.0/build-${BUILD}/ \
+		http://www.komquats.com/distfiles/
+PKGNAMESUFFIX=	-devel
+PORTVERSION=	${DISTVERSION}.b${BUILD}
 .else
-MASTER_SITES=	SF/fwbuilder/Current_Packages/${PORTVERSION}
+MASTER_SITES=	SF/fwbuilder/Current_Packages/${PORTVERSION} \
+		http://www.komquats.com/distfiles/
 .endif
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Firewall Builder API
 
-CONFLICTS=	libfwbuilder-2.*
+.if defined(BUILD)
+CONFLICTS=	libfwbuilder-[23].* libfwbuilder-devel-[23].*
+.else
+CONFLICTS=	libfwbuilder-[23].* libfwbuilder-devel-*
+.endif
+
 LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt \
 		netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp
 
-PLIST_SUB=	BUILD_VERSION=${PORTVERSION}
+PLIST_SUB=	BUILD_VERSION=${DISTVERSION}
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib \
 		gui \
@@ -37,6 +49,7 @@ QTDIR?=		${QT_PREFIX}
 
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
+CONFIGURE_SCRIPT=	autogen.sh
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
@@ -48,8 +61,8 @@ USE_LDCONFIG=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 post-install:
-	${RM} ${PREFIX}/lib/libfwbuilder.so.8.2
-	${RM} ${PREFIX}/lib/libfwcompiler.so.8.2
+	${RM} ${PREFIX}/lib/libfwbuilder.so.9.1
+	${RM} ${PREFIX}/lib/libfwcompiler.so.9.1
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
diff --git a/security/libfwbuilder-devel/distinfo b/security/libfwbuilder-devel/distinfo
index 542b83c43023..101ef5514066 100644
--- a/security/libfwbuilder-devel/distinfo
+++ b/security/libfwbuilder-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (libfwbuilder-3.0.7.tar.gz) = 70632afb9f276ac248b13b08f06db85a
-SHA256 (libfwbuilder-3.0.7.tar.gz) = b6dedda5af79e4594d5a13fa24c861da36adf33636c0e9586ad5744a272d6fde
-SIZE (libfwbuilder-3.0.7.tar.gz) = 540834
+MD5 (libfwbuilder-4.0.0.tar.gz) = d1393097e63af886c849f3da7d9f1bce
+SHA256 (libfwbuilder-4.0.0.tar.gz) = 33fb19004717c4619927b4d165f4f5d2cd949d23f3cbc96b8ab045e6e4bd3dbb
+SIZE (libfwbuilder-4.0.0.tar.gz) = 375988
diff --git a/security/libfwbuilder-devel/pkg-plist b/security/libfwbuilder-devel/pkg-plist
index 576f36745024..c90a0cad1a44 100644
--- a/security/libfwbuilder-devel/pkg-plist
+++ b/security/libfwbuilder-devel/pkg-plist
@@ -1,81 +1,89 @@
-bin/libfwbuilder-config-3
-include/fwb-3/fwcompiler/Compiler.h
-include/fwb-3/fwcompiler/NATCompiler.h
-include/fwb-3/fwcompiler/OSConfigurator.h
-include/fwb-3/fwcompiler/PolicyCompiler.h
-include/fwb-3/fwcompiler/Preprocessor.h
-include/fwb-3/fwcompiler/RoutingCompiler.h
-include/fwb-3/fwcompiler/RuleProcessor.h
-include/fwb-3/fwbuilder/Address.h
-include/fwb-3/fwbuilder/AddressRange.h
-include/fwb-3/fwbuilder/AddressTable.h
-include/fwb-3/fwbuilder/BackgroundOp.h
-include/fwb-3/fwbuilder/Constants.h
-include/fwb-3/fwbuilder/CustomService.h
-include/fwb-3/fwbuilder/DNSName.h
-include/fwb-3/fwbuilder/FWException.h
-include/fwb-3/fwbuilder/FWIntervalReference.h
-include/fwb-3/fwbuilder/FWObject.h
-include/fwb-3/fwbuilder/FWObjectDatabase.h
-include/fwb-3/fwbuilder/FWObjectReference.h
-include/fwb-3/fwbuilder/FWOptions.h
-include/fwb-3/fwbuilder/FWReference.h
-include/fwb-3/fwbuilder/FWServiceReference.h
-include/fwb-3/fwbuilder/Firewall.h
-include/fwb-3/fwbuilder/Group.h
-include/fwb-3/fwbuilder/Host.h
-include/fwb-3/fwbuilder/HostsFile.h
-include/fwb-3/fwbuilder/ICMP6Service.h
-include/fwb-3/fwbuilder/ICMPService.h
-include/fwb-3/fwbuilder/IPRoute.h
-include/fwb-3/fwbuilder/IPService.h
-include/fwb-3/fwbuilder/IPv4.h
-include/fwb-3/fwbuilder/IPv6.h
-include/fwb-3/fwbuilder/Inet6AddrMask.h
-include/fwb-3/fwbuilder/InetAddr.h
-include/fwb-3/fwbuilder/InetAddrMask.h
-include/fwb-3/fwbuilder/Interface.h
-include/fwb-3/fwbuilder/Interval.h
-include/fwb-3/fwbuilder/IntervalGroup.h
-include/fwb-3/fwbuilder/InterfaceData.h
-include/fwb-3/fwbuilder/Library.h
-include/fwb-3/fwbuilder/Logger.h
-include/fwb-3/fwbuilder/Management.h
-include/fwb-3/fwbuilder/MultiAddress.h
-include/fwb-3/fwbuilder/NAT.h
-include/fwb-3/fwbuilder/Network.h
-include/fwb-3/fwbuilder/NetworkIPv6.h
-include/fwb-3/fwbuilder/ObjectGroup.h
-include/fwb-3/fwbuilder/ObjectMatcher.h
-include/fwb-3/fwbuilder/Policy.h
-include/fwb-3/fwbuilder/Pool.h
-include/fwb-3/fwbuilder/Resources.h
-include/fwb-3/fwbuilder/Routing.h
-include/fwb-3/fwbuilder/Rule.h
-include/fwb-3/fwbuilder/RuleElement.h
-include/fwb-3/fwbuilder/RuleSet.h
-include/fwb-3/fwbuilder/Service.h
-include/fwb-3/fwbuilder/ServiceGroup.h
-include/fwb-3/fwbuilder/SyncQueue.h
-include/fwb-3/fwbuilder/TCPUDPService.h
-include/fwb-3/fwbuilder/TCPService.h
-include/fwb-3/fwbuilder/TagService.h
-include/fwb-3/fwbuilder/ThreadTools.h
-include/fwb-3/fwbuilder/UserService.h
-include/fwb-3/fwbuilder/Tools.h
-include/fwb-3/fwbuilder/UDPService.h
-include/fwb-3/fwbuilder/XMLTools.h
-include/fwb-3/fwbuilder/dns.h
-include/fwb-3/fwbuilder/inet_net.h
-include/fwb-3/fwbuilder/libfwbuilder-config.h
-include/fwb-3/fwbuilder/libfwbuilder-version.h
-include/fwb-3/fwbuilder/physAddress.h
-include/fwb-3/fwbuilder/snmp.h
-lib/libfwcompiler.so.8.2.0
-lib/libfwcompiler.so.8
+bin/libfwbuilder-config-4
+include/fwb-4/fwcompiler/BaseCompiler.h
+include/fwb-4/fwcompiler/Compiler.h
+include/fwb-4/fwcompiler/NATCompiler.h
+include/fwb-4/fwcompiler/OSConfigurator.h
+include/fwb-4/fwcompiler/PolicyCompiler.h
+include/fwb-4/fwcompiler/Preprocessor.h
+include/fwb-4/fwcompiler/RoutingCompiler.h
+include/fwb-4/fwcompiler/RuleProcessor.h
+include/fwb-4/fwbuilder/Address.h
+include/fwb-4/fwbuilder/AddressRange.h
+include/fwb-4/fwbuilder/AddressTable.h
+include/fwb-4/fwbuilder/BackgroundOp.h
+include/fwb-4/fwbuilder/Cluster.h
+include/fwb-4/fwbuilder/ClusterGroup.h
+include/fwb-4/fwbuilder/Constants.h
+include/fwb-4/fwbuilder/CustomService.h
+include/fwb-4/fwbuilder/Dispatch.h
+include/fwb-4/fwbuilder/DNSName.h
+include/fwb-4/fwbuilder/FailoverClusterGroup.h
+include/fwb-4/fwbuilder/FWException.h
+include/fwb-4/fwbuilder/FWIntervalReference.h
+include/fwb-4/fwbuilder/FWObject.h
+include/fwb-4/fwbuilder/FWObjectDatabase.h
+include/fwb-4/fwbuilder/FWObjectReference.h
+include/fwb-4/fwbuilder/FWOptions.h
+include/fwb-4/fwbuilder/FWReference.h
+include/fwb-4/fwbuilder/FWServiceReference.h
+include/fwb-4/fwbuilder/Firewall.h
+include/fwb-4/fwbuilder/Group.h
+include/fwb-4/fwbuilder/Host.h
+include/fwb-4/fwbuilder/HostsFile.h
+include/fwb-4/fwbuilder/ICMP6Service.h
+include/fwb-4/fwbuilder/ICMPService.h
+include/fwb-4/fwbuilder/IPRoute.h
+include/fwb-4/fwbuilder/IPService.h
+include/fwb-4/fwbuilder/IPv4.h
+include/fwb-4/fwbuilder/IPv6.h
+include/fwb-4/fwbuilder/Inet6AddrMask.h
+include/fwb-4/fwbuilder/InetAddr.h
+include/fwb-4/fwbuilder/InetAddrMask.h
+include/fwb-4/fwbuilder/Interface.h
+include/fwb-4/fwbuilder/Interval.h
+include/fwb-4/fwbuilder/IntervalGroup.h
+include/fwb-4/fwbuilder/InterfaceData.h
+include/fwb-4/fwbuilder/Library.h
+include/fwb-4/fwbuilder/Logger.h
+include/fwb-4/fwbuilder/Management.h
+include/fwb-4/fwbuilder/MultiAddress.h
+include/fwb-4/fwbuilder/NAT.h
+include/fwb-4/fwbuilder/Network.h
+include/fwb-4/fwbuilder/NetworkIPv6.h
+include/fwb-4/fwbuilder/ObjectGroup.h
+include/fwb-4/fwbuilder/ObjectMatcher.h
+include/fwb-4/fwbuilder/ObjectMirror.h
+include/fwb-4/fwbuilder/Policy.h
+include/fwb-4/fwbuilder/Pool.h
+include/fwb-4/fwbuilder/Resources.h
+include/fwb-4/fwbuilder/Routing.h
+include/fwb-4/fwbuilder/Rule.h
+include/fwb-4/fwbuilder/RuleElement.h
+include/fwb-4/fwbuilder/RuleSet.h
+include/fwb-4/fwbuilder/SecuwallMgmtFile.h
+include/fwb-4/fwbuilder/Service.h
+include/fwb-4/fwbuilder/ServiceGroup.h
+include/fwb-4/fwbuilder/StateSyncClusterGroup.h
+include/fwb-4/fwbuilder/SyncQueue.h
+include/fwb-4/fwbuilder/TCPUDPService.h
+include/fwb-4/fwbuilder/TCPService.h
+include/fwb-4/fwbuilder/TagService.h
+include/fwb-4/fwbuilder/ThreadTools.h
+include/fwb-4/fwbuilder/UserService.h
+include/fwb-4/fwbuilder/Tools.h
+include/fwb-4/fwbuilder/UDPService.h
+include/fwb-4/fwbuilder/XMLTools.h
+include/fwb-4/fwbuilder/dns.h
+include/fwb-4/fwbuilder/inet_net.h
+include/fwb-4/fwbuilder/libfwbuilder-config.h
+include/fwb-4/fwbuilder/libfwbuilder-version.h
+include/fwb-4/fwbuilder/physAddress.h
+include/fwb-4/fwbuilder/snmp.h
+lib/libfwcompiler.so.9.1.0
+lib/libfwcompiler.so.9
 lib/libfwcompiler.so
-lib/libfwbuilder.so.8.2.0
-lib/libfwbuilder.so.8
+lib/libfwbuilder.so.9.1.0
+lib/libfwbuilder.so.9
 lib/libfwbuilder.so
 share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.5.xslt
 share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.4.xslt
@@ -144,9 +152,15 @@ share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_6.xslt
 share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_7.xslt
 share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_8.xslt
 share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_9.xslt
+share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_10.xslt
+share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_11.xslt
+share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_12.xslt
+share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_13.xslt
+share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_14.xslt
+share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_15.xslt
 share/libfwbuilder-%%BUILD_VERSION%%/fwbuilder.dtd
 @dirrm share/libfwbuilder-%%BUILD_VERSION%%/migration
 @dirrm share/libfwbuilder-%%BUILD_VERSION%%
-@dirrm include/fwb-3/fwcompiler
-@dirrm include/fwb-3/fwbuilder
-@dirrm include/fwb-3
+@dirrm include/fwb-4/fwcompiler
+@dirrm include/fwb-4/fwbuilder
+@dirrm include/fwb-4