diff --git a/test/ipfw/firewall.fw.orig b/test/ipfw/firewall.fw.orig
index 92070f82e..0507d757b 100755
--- a/test/ipfw/firewall.fw.orig
+++ b/test/ipfw/firewall.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipfw v4.2.0.3483
+#  Firewall Builder  fwb_ipfw v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:29:36 2011 PST by vadim
+#  Generated Fri Mar 11 09:18:23 2011 PST by vadim
 #
 # files: * firewall.fw ipfw.fw
 #
@@ -34,7 +34,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() {
@@ -81,7 +81,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Sun Feb 20 21:29:36 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:18:23 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipfw/firewall1.fw.orig b/test/ipfw/firewall1.fw.orig
index 9a59f1e6e..652aeb693 100755
--- a/test/ipfw/firewall1.fw.orig
+++ b/test/ipfw/firewall1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipfw v4.2.0.3483
+#  Firewall Builder  fwb_ipfw v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:29:36 2011 PST by vadim
+#  Generated Fri Mar 11 09:18:23 2011 PST by vadim
 #
 # files: * firewall1.fw /etc/firewall1.fw
 #
@@ -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:29:36 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:18:23 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipfw/firewall2.fw.orig b/test/ipfw/firewall2.fw.orig
index c21937e97..533455b64 100755
--- a/test/ipfw/firewall2.fw.orig
+++ b/test/ipfw/firewall2.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipfw v4.2.0.3483
+#  Firewall Builder  fwb_ipfw v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:29:37 2011 PST by vadim
+#  Generated Fri Mar 11 09:18:24 2011 PST by vadim
 #
 # files: * firewall2.fw /etc/firewall2.fw
 #
@@ -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:29:37 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:18:24 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipfw/firewall33.fw.orig b/test/ipfw/firewall33.fw.orig
index 3c4f278ad..88c9a2a2f 100755
--- a/test/ipfw/firewall33.fw.orig
+++ b/test/ipfw/firewall33.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipfw v4.2.0.3483
+#  Firewall Builder  fwb_ipfw v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:29:37 2011 PST by vadim
+#  Generated Fri Mar 11 09:18:24 2011 PST by vadim
 #
 # files: * firewall33.fw /etc/fw/firewall33.fw
 #
@@ -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() {
@@ -128,8 +128,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() {
@@ -163,7 +169,7 @@ configure_interfaces() {
     update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
 }
 
-log "Activating firewall script generated Sun Feb 20 21:29:37 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:18:24 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
@@ -223,11 +229,11 @@ prolog_commands
 "$IPFW" add 220 set 1 permit all  from any  to any      keep-state  || exit 1
 # 
 # Rule  8 (global)
-"$IPFW" add 230 set 1 skipto 350 all  from any  to 74.125.224.80       || exit 1
-"$IPFW" add 240 set 1 skipto 350 all  from any  to 74.125.224.81       || exit 1
-"$IPFW" add 250 set 1 skipto 350 all  from any  to 74.125.224.82       || exit 1
-"$IPFW" add 260 set 1 skipto 350 all  from any  to 74.125.224.83       || exit 1
-"$IPFW" add 270 set 1 skipto 350 all  from any  to 74.125.224.84       || exit 1
+"$IPFW" add 230 set 1 skipto 350 all  from any  to 74.125.224.48       || exit 1
+"$IPFW" add 240 set 1 skipto 350 all  from any  to 74.125.224.49       || exit 1
+"$IPFW" add 250 set 1 skipto 350 all  from any  to 74.125.224.50       || exit 1
+"$IPFW" add 260 set 1 skipto 350 all  from any  to 74.125.224.51       || exit 1
+"$IPFW" add 270 set 1 skipto 350 all  from any  to 74.125.224.52       || exit 1
 "$IPFW" add 280 set 1 skipto 350 all  from any  to 157.166.224.25       || exit 1
 "$IPFW" add 290 set 1 skipto 350 all  from any  to 157.166.224.26       || exit 1
 "$IPFW" add 300 set 1 skipto 350 all  from any  to 157.166.226.25       || exit 1
diff --git a/test/ipfw/firewall34.fw.orig b/test/ipfw/firewall34.fw.orig
index 5f32ceefa..f255cb904 100755
--- a/test/ipfw/firewall34.fw.orig
+++ b/test/ipfw/firewall34.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipfw v4.2.0.3483
+#  Firewall Builder  fwb_ipfw v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:29:37 2011 PST by vadim
+#  Generated Fri Mar 11 09:18:24 2011 PST by vadim
 #
 # files: * firewall34.fw /etc/firewall34.fw
 #
@@ -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:29:37 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:18:24 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipfw/firewall4.fw.orig b/test/ipfw/firewall4.fw.orig
index 75899bb16..826f97af6 100755
--- a/test/ipfw/firewall4.fw.orig
+++ b/test/ipfw/firewall4.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipfw v4.2.0.3483
+#  Firewall Builder  fwb_ipfw v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:29:37 2011 PST by vadim
+#  Generated Fri Mar 11 09:18:24 2011 PST by vadim
 #
 # files: * firewall4.fw /etc/firewall4.fw
 #
@@ -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:29:37 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:18:24 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipfw/firewall7.fw.orig b/test/ipfw/firewall7.fw.orig
index e3274c3a6..7d49a234e 100755
--- a/test/ipfw/firewall7.fw.orig
+++ b/test/ipfw/firewall7.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipfw v4.2.0.3483
+#  Firewall Builder  fwb_ipfw v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:29:37 2011 PST by vadim
+#  Generated Fri Mar 11 09:18:25 2011 PST by vadim
 #
 # files: * firewall7.fw /etc/firewall7.fw
 #
@@ -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:29:37 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:18:25 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipfw/firewall8.fw.orig b/test/ipfw/firewall8.fw.orig
index 337e14db2..cbbf410a4 100755
--- a/test/ipfw/firewall8.fw.orig
+++ b/test/ipfw/firewall8.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipfw v4.2.0.3483
+#  Firewall Builder  fwb_ipfw v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:29:37 2011 PST by vadim
+#  Generated Fri Mar 11 09:18:25 2011 PST by vadim
 #
 # files: * firewall8.fw /etc/firewall8.fw
 #
@@ -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:37 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:18:25 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipfw/firewall9.fw.orig b/test/ipfw/firewall9.fw.orig
index cb837a7c2..9cb8b73a3 100755
--- a/test/ipfw/firewall9.fw.orig
+++ b/test/ipfw/firewall9.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipfw v4.2.0.3483
+#  Firewall Builder  fwb_ipfw v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:29:38 2011 PST by vadim
+#  Generated Fri Mar 11 09:18:25 2011 PST by vadim
 #
 # files: * firewall9.fw /etc/firewall9.fw
 #
@@ -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:38 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:18:25 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipfw/host.fw.orig b/test/ipfw/host.fw.orig
index be423794f..8b5f94c49 100755
--- a/test/ipfw/host.fw.orig
+++ b/test/ipfw/host.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipfw v4.2.0.3483
+#  Firewall Builder  fwb_ipfw v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:29:38 2011 PST by vadim
+#  Generated Fri Mar 11 09:18:25 2011 PST by vadim
 #
 # files: * host.fw /etc/host.fw
 #
@@ -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:29:38 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:18:25 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/ipfw/mac.fw.orig b/test/ipfw/mac.fw.orig
index caccca6a2..1fe3d079a 100755
--- a/test/ipfw/mac.fw.orig
+++ b/test/ipfw/mac.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_ipfw v4.2.0.3483
+#  Firewall Builder  fwb_ipfw v4.2.0.3496
 #
-#  Generated Sun Feb 20 21:29:38 2011 PST by vadim
+#  Generated Fri Mar 11 09:18:25 2011 PST by vadim
 #
 # files: * mac.fw /etc/mac.fw
 #
@@ -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() {
@@ -77,7 +77,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Sun Feb 20 21:29:38 2011 by vadim"
+log "Activating firewall script generated Fri Mar 11 09:18:25 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces