diff --git a/net/frr/Makefile b/net/frr/Makefile
index 3817c2107..943a71a72 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		frr
-PLUGIN_VERSION=		1.6
+PLUGIN_VERSION=		1.7
 PLUGIN_COMMENT=		The FRRouting Protocol Suite
 PLUGIN_DEPENDS=		frr5 ruby
 PLUGIN_CONFLICTS=	quagga
diff --git a/net/frr/src/etc/inc/plugins.inc.d/frr.inc b/net/frr/src/etc/inc/plugins.inc.d/frr.inc
index 3f8e90c2e..f5a6e25de 100644
--- a/net/frr/src/etc/inc/plugins.inc.d/frr.inc
+++ b/net/frr/src/etc/inc/plugins.inc.d/frr.inc
@@ -55,7 +55,7 @@ function frr_firewall($fw)
                         'statetype'      => 'keep',
                         'label'          => 'Pass OSPF (autogenerated)',
                         'from'           => $network->ipaddr . '/' . $network->netmask,
-                        'to'             => '224.0.0.0/4',
+                        'to'             => '224.0.0.0/24',
                         'direction'      => 'in',
                         'type'           => 'pass',
                         'disablereplyto' => 1,
@@ -64,7 +64,7 @@ function frr_firewall($fw)
                     null
                 );
                 $fw->registerFilterRule(
-                    1, /* priority */
+                    1,
                     array(
                         'ipprotocol'     => 'inet',
                         'protocol'       => 'ospf',
@@ -79,6 +79,38 @@ function frr_firewall($fw)
                     ),
                     null
                 );
+                $fw->registerFilterRule(
+                    1,
+                    array(
+                        'ipprotocol'     => 'inet',
+                        'protocol'       => 'ospf',
+                        'statetype'      => 'keep',
+                        'label'          => 'Pass OSPF (autogenerated)',
+                        'from'           => '224.0.0.0/24',
+                        'to'             => $network->ipaddr . '/' . $network->netmask,
+                        'direction'      => 'out',
+                        'type'           => 'pass',
+                        'disablereplyto' => 1,
+                        'quick'          => true
+                    ),
+                    null
+                );
+                $fw->registerFilterRule(
+                    1,
+                    array(
+                        'ipprotocol'     => 'inet',
+                        'protocol'       => 'ospf',
+                        'statetype'      => 'keep',
+                        'label'          => 'Pass OSPF UNICAST (autogenerated)',
+                        'from'           => '(self)',
+                        'to'             => $network->ipaddr . '/' . $network->netmask,
+                        'direction'      => 'out',
+                        'type'           => 'pass',
+                        'disablereplyto' => 1,
+                        'quick'          => true
+                    ),
+                    null
+                );
             }
         }
     }