diff --git a/net/frr/Makefile b/net/frr/Makefile
index bc203e8c5..4e59d97df 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		frr
-PLUGIN_VERSION=		1.29
+PLUGIN_VERSION=		1.30
 PLUGIN_COMMENT=		The FRRouting Protocol Suite
 PLUGIN_DEPENDS=		frr7
 PLUGIN_MAINTAINER=	franz.fabian.94@gmail.com
diff --git a/net/frr/pkg-descr b/net/frr/pkg-descr
index 6b2d8bd82..3346819b2 100644
--- a/net/frr/pkg-descr
+++ b/net/frr/pkg-descr
@@ -12,6 +12,10 @@ WWW: https://frrouting.org/
 Plugin Changelog
 ================
 
+1.30
+
+* Allow specifying multiple PrefixLists and CommunityLists (contributed by Patrik Kernstock)
+
 1.29
 
 * Add disable-connected-check option and BGP weight option
diff --git a/net/frr/src/opnsense/service/conf/actions.d/actions_quagga.conf b/net/frr/src/opnsense/service/conf/actions.d/actions_quagga.conf
index 74e2e7cb2..8a4c50ce5 100644
--- a/net/frr/src/opnsense/service/conf/actions.d/actions_quagga.conf
+++ b/net/frr/src/opnsense/service/conf/actions.d/actions_quagga.conf
@@ -1,26 +1,26 @@
 [start]
-command:/usr/local/opnsense/scripts/quagga/setup.sh;/usr/local/etc/rc.d/frr start
+command:/usr/local/etc/rc.d/frr start
 parameters:
 type:script
-message:starting quagga
+message:starting frr
 
 [stop]
-command:/usr/local/etc/rc.d/frr stop; exit 0
+command:/usr/local/etc/rc.d/frr stop
 parameters:
 type:script
-message:stopping quagga
+message:stopping frr
 
 [restart]
-command:/usr/local/opnsense/scripts/quagga/setup.sh;/usr/local/etc/rc.d/frr restart
+command:/usr/local/etc/rc.d/frr restart
 parameters:
 type:script
-message:restarting quagga
+message:restarting frr
 
 [status]
-command:/usr/local/etc/rc.d/frr status;exit 0
+command:/usr/local/etc/rc.d/frr status; exit 0
 parameters:
 type:script_output
-message:request quagga
+message:request frr
 
 [diagnostics.general_running-config]
 command:/usr/local/bin/vtysh -c "show running-config"
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr
index 2b0b29166..d95013c2f 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr
@@ -1,5 +1,5 @@
 {% if helpers.exists('OPNsense.quagga.general.enabled') and OPNsense.quagga.general.enabled == '1' %}
-frr_var_script="/usr/local/opnsense/scripts/quagga/setup.sh"
+frr_setup="/usr/local/opnsense/scripts/quagga/setup.sh"
 frr_enable="YES"
 {% if helpers.exists('OPNsense.quagga.general.enablecarp') and OPNsense.quagga.general.enablecarp == '1' %}
 start_precmd="ifconfig | grep 'carp: MASTER'"