diff --git a/net/frr/Makefile b/net/frr/Makefile
index 4b9b90c4a..3817c2107 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -1,5 +1,5 @@
PLUGIN_NAME= frr
-PLUGIN_VERSION= 1.5
+PLUGIN_VERSION= 1.6
PLUGIN_COMMENT= The FRRouting Protocol Suite
PLUGIN_DEPENDS= frr5 ruby
PLUGIN_CONFLICTS= quagga
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml
index a5f58a52a..61e4a3320 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml
@@ -20,6 +20,12 @@
text
+
+ interface.authkey_id
+
+ true
+ text
+
interface.cost
diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml
index 8886b16a6..c6cbc8e3b 100644
--- a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml
+++ b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml
@@ -1,7 +1,7 @@
//OPNsense/quagga/ospf
OSPF Routing configuration
- 1.0.0
+ 1.0.1
0
@@ -118,6 +118,13 @@
N
/^\S+$/
+
+ 1
+ 1
+ 255
+ Y
+ The authentication key ID must be between 1 and 255.
+
0
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf
index 1fbd9f6bd..9ee53d580 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf
@@ -27,7 +27,7 @@ interface {{ physical_interface(interface.interfacename) }}
}}{% endif %}
{{ cline("authentication",interface.authtype)
}}{% if interface.authtype and interface.authtype == 'message-digest'
-%}{{ cline("message-digest-key 1 md5",interface.authkey)
+%}{{ cline("message-digest-key " + interface.authkey_id + " md5",interface.authkey)
}}{% endif
%}{{ cline("cost",interface.cost)
}}{{ cline("dead-interval",interface.deadinterval)