diff --git a/Shorewall-common/lib.config b/Shorewall-common/lib.config
index 010f9a1d9..730a4509d 100644
--- a/Shorewall-common/lib.config
+++ b/Shorewall-common/lib.config
@@ -233,7 +233,6 @@ determine_zones()
     ZONES=
     IPV4_ZONES=
     IPSEC_ZONES=
-    BPORT_ZONES=
 
     [ "$IPSECFILE" = zones ] && new_zone_file=Yes || test -n "${FW:=fw}"
 
@@ -296,7 +295,6 @@ determine_zones()
 		    [ "$PROGRAM" = compiler ] && startup_error "Invalid Zone Type: $type"
 		    list_search $zone $ZONES $FW && startup_error "Zone $zone is defined more than once"
 		    merge_zone
-		    BPORT_ZONES="$BPORT_ZONES $zone"
 		    BRIDGING=Yes
 		    ;;
 		*)
diff --git a/Shorewall-common/lib.dynamiczones b/Shorewall-common/lib.dynamiczones
index 025d40cc9..6f227f3d9 100644
--- a/Shorewall-common/lib.dynamiczones
+++ b/Shorewall-common/lib.dynamiczones
@@ -107,8 +107,6 @@ add_to_zone() # $1...${n-1} = <interface>[:<hosts>] $n = zone
 
     [ "$zone" = $FW ] && startup_error "Can't add $1 to firewall zone"
 
-    list_search $zone $BPORT_ZONES && startup_error "Bridge Port zones may not be dynamically modified"
-
     #
     # Be sure that Shorewall has been restarted using a DZ-aware version of the code
     #
@@ -121,6 +119,13 @@ add_to_zone() # $1...${n-1} = <interface>[:<hosts>] $n = zone
 
     while read z type hosts; do
 	if [ "$z" = "$zone" ]; then
+	    case $type in
+		bport4:*)
+		    rm -f ${VARDIR}/zones_$$
+		    startup_error "Bridge Port zones may not be dynamically modified"
+		    ;;
+	    esac
+
 	    case "$hosts" in
 		*exclude*)
 		    rm -f ${VARDIR}/zones_$$