diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/ebtables/300-radv-input-output b/package/gluon-mesh-batman-adv-core/files/lib/gluon/ebtables/300-radv-input-output
new file mode 100644
index 00000000..377d11cd
--- /dev/null
+++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/ebtables/300-radv-input-output
@@ -0,0 +1,2 @@
+rule 'INPUT -p IPv6 --ip6-protocol ipv6-icmp --ip6-icmp-type router-solicitation -i bat0 -j DROP'
+rule 'OUTPUT -p IPv6 --ip6-protocol ipv6-icmp --ip6-icmp-type router-advertisement -o bat0 -j DROP'
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/radvd/arguments b/package/gluon-mesh-batman-adv-core/files/lib/gluon/radvd/arguments
new file mode 100755
index 00000000..4062748a
--- /dev/null
+++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/radvd/arguments
@@ -0,0 +1,3 @@
+#!/usr/bin/lua
+local site = require "gluon.site_config"
+print("-i br-client -p " .. site.prefix6)
diff --git a/package/gluon-radvd/files/etc/init.d/gluon-radvd b/package/gluon-radvd/files/etc/init.d/gluon-radvd
index 98cf7a36..5e0f5962 100755
--- a/package/gluon-radvd/files/etc/init.d/gluon-radvd
+++ b/package/gluon-radvd/files/etc/init.d/gluon-radvd
@@ -7,7 +7,9 @@ SERVICE_DAEMONIZE=1
 
 
 start() {
-	service_start /usr/sbin/uradvd -i local-node -a $(lua -e 'print(require("gluon.site_config").prefix6)') --default-lifetime 900
+  [ -x /lib/gluon/radvd/arguments ] && {
+	service_start /usr/sbin/uradvd $(/lib/gluon/radvd/arguments)
+  }
 }
 
 stop() {