diff --git a/package/gluon-radvd/files/lib/gluon/ebtables/300-radv-input-output b/package/gluon-mesh-batman-adv-core/files/lib/gluon/ebtables/300-radv-input-output
similarity index 100%
rename from package/gluon-radvd/files/lib/gluon/ebtables/300-radv-input-output
rename to package/gluon-mesh-batman-adv-core/files/lib/gluon/ebtables/300-radv-input-output
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/Makefile b/package/gluon-radvd/Makefile
index 3c126fe1..0ca18177 100644
--- a/package/gluon-radvd/Makefile
+++ b/package/gluon-radvd/Makefile
@@ -12,7 +12,7 @@ define Package/gluon-radvd
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Advertise an IPv6 prefix from the node
-  DEPENDS:=+gluon-core +gluon-ebtables +gluon-mesh-batman-adv +uradvd
+  DEPENDS:=+gluon-core +uradvd
 endef
 
 define Package/gluon-radvd/description
diff --git a/package/gluon-radvd/files/etc/init.d/gluon-radvd b/package/gluon-radvd/files/etc/init.d/gluon-radvd
index d7a981d4..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 br-client -p $(lua -e 'print(require("gluon.site_config").prefix6)')
+  [ -x /lib/gluon/radvd/arguments ] && {
+	service_start /usr/sbin/uradvd $(/lib/gluon/radvd/arguments)
+  }
 }
 
 stop() {