diff --git a/test/ipf/firewall.fw.orig b/test/ipf/firewall.fw.orig
index 832daab99..c15896977 100755
--- a/test/ipf/firewall.fw.orig
+++ b/test/ipf/firewall.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipf v4.2.0.3483
+#  Firewall Builder  fwb_ipf v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:28:57 2011 PST by vadim
+#  Generated Fri Mar 11 09:17:17 2011 PST by vadim
 #
 # files: * firewall.fw ipf.fw
 # files:   firewall-ipf.conf ipf.conf
@@ -36,7 +36,7 @@ LOGGER="/usr/bin/logger"
 
 log() {
     echo "$1"
-    command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1"
+    command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
 }
 
 diff_intf() {
@@ -133,8 +133,14 @@ update_addresses_of_interface() {
       test -z "$FWBDEBUG" && exit 1
     }
 
-    diff_intf missing_address "$FWB_ADDRS" "$CURRENT_ADDRS_ALL_SCOPES" add
-    diff_intf missing_address "$CURRENT_ADDRS_GLOBAL_SCOPE" "$FWB_ADDRS" del
+
+    echo "$interface" | grep -q carp && {
+        diff_intf missing_address "$CURRENT_ADDRS_GLOBAL_SCOPE" "$FWB_ADDRS" del
+        diff_intf missing_address "$FWB_ADDRS" "$CURRENT_ADDRS_ALL_SCOPES" add
+    } || {
+        diff_intf missing_address "$FWB_ADDRS" "$CURRENT_ADDRS_ALL_SCOPES" add
+        diff_intf missing_address "$CURRENT_ADDRS_GLOBAL_SCOPE" "$FWB_ADDRS" del
+    }
 }
 
 verify_interfaces() {
@@ -169,7 +175,7 @@ configure_interfaces() {
     update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
 }
 
-log "Activating firewall script generated Sun Feb 20 21:28:57 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:17:17 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipf/firewall1.fw.orig b/test/ipf/firewall1.fw.orig
index 7a4a91656..4526b3502 100755
--- a/test/ipf/firewall1.fw.orig
+++ b/test/ipf/firewall1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipf v4.2.0.3483
+#  Firewall Builder  fwb_ipf v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:28:57 2011 PST by vadim
+#  Generated Fri Mar 11 09:17:17 2011 PST by vadim
 #
 # files: * firewall1.fw /etc/ipf.fw
 # files:   firewall1-ipf.conf /etc/fw/ipf.conf
@@ -36,7 +36,7 @@ LOGGER="/usr/bin/logger"
 
 log() {
     echo "$1"
-    command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1"
+    command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
 }
 
 diff_intf() {
@@ -83,7 +83,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Sun Feb 20 21:28:57 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:17:17 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipf/firewall10.fw.orig b/test/ipf/firewall10.fw.orig
index a32b13eac..6bf6b5896 100755
--- a/test/ipf/firewall10.fw.orig
+++ b/test/ipf/firewall10.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipf v4.2.0.3483
+#  Firewall Builder  fwb_ipf v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:28:57 2011 PST by vadim
+#  Generated Fri Mar 11 09:17:17 2011 PST by vadim
 #
 # files: * firewall10.fw /etc/firewall10.fw
 # files:   firewall10-ipf.conf /etc/firewall10-ipf.conf
@@ -28,7 +28,7 @@ LOGGER="/usr/bin/logger"
 
 log() {
     echo "$1"
-    command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1"
+    command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
 }
 
 diff_intf() {
@@ -75,7 +75,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Sun Feb 20 21:28:57 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:17:17 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipf/firewall11.fw.orig b/test/ipf/firewall11.fw.orig
index a5017df6f..bd46f8555 100755
--- a/test/ipf/firewall11.fw.orig
+++ b/test/ipf/firewall11.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipf v4.2.0.3483
+#  Firewall Builder  fwb_ipf v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:28:57 2011 PST by vadim
+#  Generated Fri Mar 11 09:17:17 2011 PST by vadim
 #
 # files: * firewall11.fw /etc/firewall11.fw
 # files:   firewall11-ipf.conf /etc/firewall11-ipf.conf
@@ -29,7 +29,7 @@ LOGGER="/usr/bin/logger"
 
 log() {
     echo "$1"
-    command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1"
+    command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
 }
 
 diff_intf() {
@@ -126,8 +126,14 @@ update_addresses_of_interface() {
       test -z "$FWBDEBUG" && exit 1
     }
 
-    diff_intf missing_address "$FWB_ADDRS" "$CURRENT_ADDRS_ALL_SCOPES" add
-    diff_intf missing_address "$CURRENT_ADDRS_GLOBAL_SCOPE" "$FWB_ADDRS" del
+
+    echo "$interface" | grep -q carp && {
+        diff_intf missing_address "$CURRENT_ADDRS_GLOBAL_SCOPE" "$FWB_ADDRS" del
+        diff_intf missing_address "$FWB_ADDRS" "$CURRENT_ADDRS_ALL_SCOPES" add
+    } || {
+        diff_intf missing_address "$FWB_ADDRS" "$CURRENT_ADDRS_ALL_SCOPES" add
+        diff_intf missing_address "$CURRENT_ADDRS_GLOBAL_SCOPE" "$FWB_ADDRS" del
+    }
 }
 
 verify_interfaces() {
@@ -162,7 +168,7 @@ configure_interfaces() {
     update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
 }
 
-log "Activating firewall script generated Sun Feb 20 21:28:57 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:17:17 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipf/firewall2.fw.orig b/test/ipf/firewall2.fw.orig
index 9eb8c3d56..a3e9509e2 100755
--- a/test/ipf/firewall2.fw.orig
+++ b/test/ipf/firewall2.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipf v4.2.0.3483
+#  Firewall Builder  fwb_ipf v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:28:58 2011 PST by vadim
+#  Generated Fri Mar 11 09:17:19 2011 PST by vadim
 #
 # files: * firewall2.fw /etc/fw/firewall2.fw
 # files:   firewall2-ipf.conf /etc/fw/firewall2-ipf.conf
@@ -32,7 +32,7 @@ LOGGER="/usr/bin/logger"
 
 log() {
     echo "$1"
-    command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1"
+    command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
 }
 
 diff_intf() {
@@ -79,7 +79,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Sun Feb 20 21:28:58 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:17:19 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipf/firewall34.fw.orig b/test/ipf/firewall34.fw.orig
index 6359e001e..078a62385 100755
--- a/test/ipf/firewall34.fw.orig
+++ b/test/ipf/firewall34.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipf v4.2.0.3483
+#  Firewall Builder  fwb_ipf v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:28:58 2011 PST by vadim
+#  Generated Fri Mar 11 09:17:19 2011 PST by vadim
 #
 # files: * firewall34.fw /etc/fw/firewall34.fw
 # files:   firewall34-ipf.conf /etc/fw/firewall34-ipf.conf
@@ -30,7 +30,7 @@ LOGGER="/usr/bin/logger"
 
 log() {
     echo "$1"
-    command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1"
+    command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
 }
 
 diff_intf() {
@@ -127,8 +127,14 @@ update_addresses_of_interface() {
       test -z "$FWBDEBUG" && exit 1
     }
 
-    diff_intf missing_address "$FWB_ADDRS" "$CURRENT_ADDRS_ALL_SCOPES" add
-    diff_intf missing_address "$CURRENT_ADDRS_GLOBAL_SCOPE" "$FWB_ADDRS" del
+
+    echo "$interface" | grep -q carp && {
+        diff_intf missing_address "$CURRENT_ADDRS_GLOBAL_SCOPE" "$FWB_ADDRS" del
+        diff_intf missing_address "$FWB_ADDRS" "$CURRENT_ADDRS_ALL_SCOPES" add
+    } || {
+        diff_intf missing_address "$FWB_ADDRS" "$CURRENT_ADDRS_ALL_SCOPES" add
+        diff_intf missing_address "$CURRENT_ADDRS_GLOBAL_SCOPE" "$FWB_ADDRS" del
+    }
 }
 
 verify_interfaces() {
@@ -162,7 +168,7 @@ configure_interfaces() {
     update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
 }
 
-log "Activating firewall script generated Sun Feb 20 21:28:58 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:17:19 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipf/firewall35.fw.orig b/test/ipf/firewall35.fw.orig
index 5b55ecf1f..aa7931f0e 100755
--- a/test/ipf/firewall35.fw.orig
+++ b/test/ipf/firewall35.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipf v4.2.0.3483
+#  Firewall Builder  fwb_ipf v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:28:59 2011 PST by vadim
+#  Generated Fri Mar 11 09:17:19 2011 PST by vadim
 #
 # files: * firewall35.fw /etc/firewall35.fw
 # files:   firewall35-ipf.conf /etc/firewall35-ipf.conf
@@ -30,7 +30,7 @@ LOGGER="/usr/bin/logger"
 
 log() {
     echo "$1"
-    command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1"
+    command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
 }
 
 diff_intf() {
@@ -77,7 +77,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Sun Feb 20 21:28:59 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:17:19 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipf/firewall4.fw.orig b/test/ipf/firewall4.fw.orig
index 5526df927..f4cb4fc15 100755
--- a/test/ipf/firewall4.fw.orig
+++ b/test/ipf/firewall4.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipf v4.2.0.3483
+#  Firewall Builder  fwb_ipf v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:28:59 2011 PST by vadim
+#  Generated Fri Mar 11 09:17:19 2011 PST by vadim
 #
 # files: * firewall4.fw /etc/fw/firewall4.fw
 # files:   firewall4-ipf.conf /etc/fw/firewall4-ipf.conf
@@ -33,7 +33,7 @@ LOGGER="/usr/bin/logger"
 
 log() {
     echo "$1"
-    command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1"
+    command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
 }
 
 diff_intf() {
@@ -80,7 +80,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Sun Feb 20 21:28:59 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:17:19 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipf/firewall5.fw.orig b/test/ipf/firewall5.fw.orig
index 0bc0c814e..2af4c3623 100755
--- a/test/ipf/firewall5.fw.orig
+++ b/test/ipf/firewall5.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipf v4.2.0.3483
+#  Firewall Builder  fwb_ipf v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:28:59 2011 PST by vadim
+#  Generated Fri Mar 11 09:17:19 2011 PST by vadim
 #
 # files: * firewall5.fw /etc/firewall5.fw
 # files:   firewall5-ipf.conf /etc/firewall5-ipf.conf
@@ -30,7 +30,7 @@ LOGGER="/usr/bin/logger"
 
 log() {
     echo "$1"
-    command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1"
+    command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
 }
 
 diff_intf() {
@@ -92,7 +92,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Sun Feb 20 21:28:59 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:17:19 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipf/firewall7.fw.orig b/test/ipf/firewall7.fw.orig
index be18b1bf2..3d261043e 100755
--- a/test/ipf/firewall7.fw.orig
+++ b/test/ipf/firewall7.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipf v4.2.0.3483
+#  Firewall Builder  fwb_ipf v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:28:59 2011 PST by vadim
+#  Generated Fri Mar 11 09:17:20 2011 PST by vadim
 #
 # files: * firewall7.fw /etc/fw/firewall7.fw
 # files:   firewall7-ipf.conf /etc/fw/firewall7-ipf.conf
@@ -29,7 +29,7 @@ LOGGER="/usr/bin/logger"
 
 log() {
     echo "$1"
-    command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1"
+    command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
 }
 
 diff_intf() {
@@ -76,7 +76,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Sun Feb 20 21:28:59 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:17:20 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipf/firewall8.fw.orig b/test/ipf/firewall8.fw.orig
index 222fadbfd..01d0ab74d 100755
--- a/test/ipf/firewall8.fw.orig
+++ b/test/ipf/firewall8.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipf v4.2.0.3483
+#  Firewall Builder  fwb_ipf v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:28:59 2011 PST by vadim
+#  Generated Fri Mar 11 09:17:20 2011 PST by vadim
 #
 # files: * firewall8.fw /etc/firewall8.fw
 # files:   firewall8-ipf.conf /etc/firewall8-ipf.conf
@@ -29,7 +29,7 @@ LOGGER="/usr/bin/logger"
 
 log() {
     echo "$1"
-    command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1"
+    command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
 }
 
 diff_intf() {
@@ -76,7 +76,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Sun Feb 20 21:28:59 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:17:20 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipf/firewall9.fw.orig b/test/ipf/firewall9.fw.orig
index 5e2a943d6..bf6b85229 100755
--- a/test/ipf/firewall9.fw.orig
+++ b/test/ipf/firewall9.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipf v4.2.0.3483
+#  Firewall Builder  fwb_ipf v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:29:00 2011 PST by vadim
+#  Generated Fri Mar 11 09:17:20 2011 PST by vadim
 #
 # files: * firewall9.fw /etc/firewall9.fw
 # files:   firewall9-ipf.conf /etc/firewall9-ipf.conf
@@ -29,7 +29,7 @@ LOGGER="/usr/bin/logger"
 
 log() {
     echo "$1"
-    command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1"
+    command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
 }
 
 diff_intf() {
@@ -76,7 +76,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Sun Feb 20 21:29:00 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:17:20 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipf/host.fw.orig b/test/ipf/host.fw.orig
index 003447c40..32e16f3f2 100755
--- a/test/ipf/host.fw.orig
+++ b/test/ipf/host.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipf v4.2.0.3483
+#  Firewall Builder  fwb_ipf v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:29:00 2011 PST by vadim
+#  Generated Fri Mar 11 09:17:20 2011 PST by vadim
 #
 # files: * host.fw /etc/fw/host.fw
 # files:   host-ipf.conf /etc/fw/host-ipf.conf
@@ -31,7 +31,7 @@ LOGGER="/usr/bin/logger"
 
 log() {
     echo "$1"
-    command -v "$LOGGER" &>/dev/null && $LOGGER -p info "$1"
+    command -v "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1"
 }
 
 diff_intf() {
@@ -78,7 +78,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Sun Feb 20 21:29:00 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:17:20 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces