diff --git a/Shorewall/action.Broadcast b/Shorewall/action.Broadcast
new file mode 100644
index 000000000..8c85211c5
--- /dev/null
+++ b/Shorewall/action.Broadcast
@@ -0,0 +1,81 @@
+#
+# Shorewall 4 - Broadcast Action
+#
+#    /usr/share/shorewall/action.Broadcast
+#
+#     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
+#
+#     (c) 2011 - Tom Eastep (teastep@shorewall.net)
+#
+#       Complete documentation is available at http://shorewall.net
+#
+#       This program is free software; you can redistribute it and/or modify
+#       it under the terms of Version 2 of the GNU General Public License
+#       as published by the Free Software Foundation.
+#
+#       This program is distributed in the hope that it will be useful,
+#       but WITHOUT ANY WARRANTY; without even the implied warranty of
+#       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#       GNU General Public License for more details.
+#
+#       You should have received a copy of the GNU General Public License
+#       along with this program; if not, write to the Free Software
+#       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#   Broadcast[([<action>|-[,{audit|-}])] 
+#
+#       Default action is DROP
+#
+##########################################################################################
+FORMAT 2
+
+DEFAULTS DROP,-
+
+BEGIN PERL;
+
+use Shorewall::IPAddrs;
+use Shorewall::Config;
+use Shorewall::Chains;
+
+my $chainref         = get_action_chain;
+my ( $action, $audit ) = get_action_params( 2 );
+my ( $level, $tag )  = get_action_logging;
+my $target           = require_audit ( $action , $audit );
+
+fatal_error "Invalid parameter to action Broadcast"   if supplied $audit && $audit ne 'audit';
+
+if ( have_capability( 'ADDRTYPE' ) ) {
+    if ( $level ne '' ) {
+	log_rule_limit $level, $chainref, 'dropBcast' , $action, '', $tag, 'add', ' -m addrtype --dst-type BROADCAST ';
+	log_rule_limit $level, $chainref, 'dropBcast' , $action, '', $tag, 'add', ' -m addrtype --dst-type MULTICAST ';
+	log_rule_limit $level, $chainref, 'dropBcast' , $action, '', $tag, 'add', ' -m addrtype --dst-type ANYCAST ';
+    }	
+
+    add_jump $chainref, $target, 0, "-m addrtype --dst-type BROADCAST ";
+    add_jump $chainref, $target, 0, "-m addrtype --dst-type MULTICAST ";
+    add_jump $chainref, $target, 0, "-m addrtype --dst-type ANYCAST ";
+} else {
+    if ( $family == F_IPV4 ) {
+	add_commands $chainref, 'for address in $ALL_BCASTS; do';
+    } else {
+	add_commands $chainref, 'for address in $ALL_BCASTS; do';
+    }
+
+    incr_cmd_level $chainref;
+    log_rule_limit $level, $chainref, 'Broadcast' , $action, '', $tag, 'add', ' -d $address ' if $level ne '';
+    add_jump $chainref, $target, 0, "-d \$address ";
+    decr_cmd_level $chainref;
+    add_commands $chainref, 'done';
+    
+    if ( $family == F_IPV4 ) {
+	log_rule_limit $level, $chainref, 'Broadcast' , $action, '', $tag, 'add', ' -d 224.0.0.0/4 ' if $level ne '';
+	add_jump $chainref, $target, 0, '-d 224.0.0.0/4 ';
+    } else {
+	log_rule_limit( $level, $chainref, 'Broadcast' , $action, '', $tag, 'add', join( ' ', '-d', IPv6_MULTICAST . ' ' ) )  if $level ne '';
+	add_jump $chainref, $target, 0, join( ' ', '-d', IPv6_MULTICAST . ' ' );
+    }	
+}
+
+1;
+
+END PERL;
diff --git a/Shorewall/action.Drop b/Shorewall/action.Drop
index dcc91ced2..961144e48 100644
--- a/Shorewall/action.Drop
+++ b/Shorewall/action.Drop
@@ -70,7 +70,7 @@ Auth($2)
 #
 # Don't log broadcasts
 #
-dropBcast($1)
+Broadcast(DROP,$1)
 #
 # ACCEPT critical ICMP types
 #
diff --git a/Shorewall/action.Reject b/Shorewall/action.Reject
index 40b9212f9..3c4fc8be8 100644
--- a/Shorewall/action.Reject
+++ b/Shorewall/action.Reject
@@ -67,7 +67,7 @@ Auth($2)
 # Drop Broadcasts so they don't clutter up the log
 # (broadcasts must *not* be rejected).
 #
-dropBcast($1)
+Broadcast(DROP,$1)
 #
 # ACCEPT critical ICMP types
 #
diff --git a/Shorewall/actions.std b/Shorewall/actions.std
index 029d44c18..6a9ad9ced 100644
--- a/Shorewall/actions.std
+++ b/Shorewall/actions.std
@@ -35,5 +35,6 @@
 #ACTION
 A_Drop 		    # Audited Default Action for DROP policy
 A_Reject	    # Audited Default action for REJECT policy
+Broadcast	    # Handles Broadcast/Multicast/Anycast
 Drop		    # Default Action for DROP policy
 Reject		    # Default Action for REJECT policy