diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 5c5e15160..101988ed2 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=       quagga
-PLUGIN_VERSION=    0.0.1
+PLUGIN_VERSION=    0.0.2
 PLUGIN_COMMENT=    Quagga Routing Suite
 PLUGIN_MAINTAINER= franz.fabian.94@gmail.com
 PLUGIN_DEVEL =     yes
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
index 2cb5a7037..194badc6d 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/bgp.xml
@@ -3,6 +3,6 @@
         <id>routing.bgp.general.Enabled</id>
         <label>enable</label>
         <type>checkbox</type>
-        <help>This will activate the ospf service.</help>
+        <help>This will activate the bgp service.</help>
     </field>
 </form>
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFNetwork.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFNetwork.xml
index a7a81c9d8..eb4f548a7 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFNetwork.xml
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFNetwork.xml
@@ -18,5 +18,6 @@
     <id>network.area</id>
     <label>Area</label>
     <type>text</type>
+    <help>Area in wildcard mask style like 0.0.0.0 and no decimal 0</help>
   </field>
 </form>
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/isis.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/isis.xml
index 8989507a5..bf188c45c 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/isis.xml
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/isis.xml
@@ -3,6 +3,6 @@
         <id>routing.isis.general.Enabled</id>
         <label>enable</label>
         <type>checkbox</type>
-        <help>This will activate the ospf service.</help>
+        <help>This will activate the isis service.</help>
     </field>
 </form>
diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml
index 7adf10562..729a5fe53 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/rip.xml
@@ -3,6 +3,6 @@
         <id>routing.rip.general.Enabled</id>
         <label>enable</label>
         <type>checkbox</type>
-        <help>This will activate the ospf service.</help>
+        <help>This will activate the rip service.</help>
     </field>
 </form>
diff --git a/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/General.xml b/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/General.xml
index 3d9d25eb2..31bb3778f 100644
--- a/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/General.xml
+++ b/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/General.xml
@@ -1,6 +1,6 @@
 <model>
     <mount>//OPNsense/quagga/general</mount>
-    <description>OSPF Routing configuration</description>
+    <description>Quagga Routing configuration</description>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
diff --git a/net/quagga/src/opnsense/scripts/quagga/setup.sh b/net/quagga/src/opnsense/scripts/quagga/setup.sh
new file mode 100755
index 000000000..4499cd3cc
--- /dev/null
+++ b/net/quagga/src/opnsense/scripts/quagga/setup.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+user=quagga
+group=quagga
+
+mkdir -p /var/run/quagga 
+chown $user:$group /var/run/quagga 
+chmod 750 /var/run/quagga
+
+mkdir -p /usr/local/etc/quagga 
+chown $user:$group /usr/local/etc/quagga 
+chmod 750 /usr/local/etc/quagga
+ 
diff --git a/net/quagga/src/opnsense/service/conf/actions.d/actions_quagga.conf b/net/quagga/src/opnsense/service/conf/actions.d/actions_quagga.conf
index 3e0d2503e..28a91fb78 100644
--- a/net/quagga/src/opnsense/service/conf/actions.d/actions_quagga.conf
+++ b/net/quagga/src/opnsense/service/conf/actions.d/actions_quagga.conf
@@ -1,5 +1,5 @@
 [start]
-command:/usr/local/etc/rc.d/quagga start
+command:/usr/local/opnsense/scripts/quagga/setup.sh;/usr/local/etc/rc.d/quagga start
 parameters:
 type:script
 message:starting quagga
diff --git a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/+TARGETS b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/+TARGETS
index 49745db1b..17356eed7 100644
--- a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/+TARGETS
+++ b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/+TARGETS
@@ -1,2 +1,3 @@
 ospfd.conf:/usr/local/etc/quagga/ospfd.conf
 quagga:/etc/rc.conf.d/quagga
+zebra.conf:/usr/local/etc/quagga/zebra.conf
diff --git a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga
index 78f123e82..82b50dfb0 100644
--- a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga
+++ b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga
@@ -1,6 +1,10 @@
 defaultrouter="NO"
 quagga_enable="{% if helpers.exists('OPNsense.quagga.general.enabled') and OPNsense.quagga.general.enabled == '1' %}YES{% else %}NO{% endif %}"
 
+{% if helpers.exists('OPNsense.quagga.general.enabled') and OPNsense.quagga.general.enabled == '1' %}
+quagga_opnsense_bootup_run="/usr/local/opnsense/scripts/quagga/setup.sh"
+{% endif %}
+
 quagga_daemons="zebra{%
 if helpers.exists('OPNsense.quagga.ospf.enabled') and OPNsense.quagga.ospf.enabled == '1' %} ospfd{% endif %}{%
 if helpers.exists('OPNsense.quagga.rip.enabled') and OPNsense.quagga.ripd.enabled == '1' %} ripd{% endif %}{%
diff --git a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/zebra.conf b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/zebra.conf
new file mode 100644
index 000000000..1ee6ba8f6
--- /dev/null
+++ b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/zebra.conf
@@ -0,0 +1,14 @@
+!
+! Zebra configuration saved from vty
+!   2017/03/03 20:21:04
+!
+!
+!
+!
+!
+ip forwarding
+ipv6 forwarding
+!
+!
+line vty
+!