diff --git a/ffpb/gluon-batman-on-wan/Makefile b/ffpb/gluon-batman-on-wan/Makefile
index 6738e441fe7c430f167c464f14f46507433ac271..dd26cad4e254ae247bcad606a03b181798675025 100644
--- a/ffpb/gluon-batman-on-wan/Makefile
+++ b/ffpb/gluon-batman-on-wan/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=ffpb-batman-on-wan
-PKG_VERSION:=1
+PKG_NAME := gluon-batman-on-wan
+PKG_VERSION := 2
 PKG_RELEASE:=$(GLUON_VERSION).$(GLUON_SITE_CODE)-$(GLUON_RELEASE).$(GLUON_CONFIG_VERSION)
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
@@ -12,7 +12,7 @@ define Package/gluon-batman-on-wan
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Option to enable mesh (batadv) on WAN port
-  DEPENDS:=+gluon-core +gluon-mesh-batman-adv
+  DEPENDS:=+gluon-core +gluon-mesh-batman-adv +luci-lib-core
 endef
 
 define Package/gluon-batman-on-wan/description
@@ -36,7 +36,7 @@ define Build/Compile
 endef
 
 define Package/gluon-batman-on-wan/install
-	$(GLUON_GENERATE) ./generate/* $(1)/
+	$(CP) ./files/* $(1)/
 
 	$(INSTALL_DIR) $(1)/lib/gluon
 endef
diff --git a/ffpb/gluon-batman-on-wan/files/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan b/ffpb/gluon-batman-on-wan/files/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan
new file mode 100644
index 0000000000000000000000000000000000000000..aa1711958f4be9a20485a3e3efe87cde0bc66413
--- /dev/null
+++ b/ffpb/gluon-batman-on-wan/files/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan
@@ -0,0 +1,19 @@
+#!/usr/bin/lua
+
+local site = require 'gluon.site_config'
+local sysconfig = require 'gluon.sysconfig'
+local uci = require 'luci.model.uci'
+
+local c = uci.cursor()
+
+c:section('network', 'interface', 'mesh_wan',
+	{
+		ifname = 'br-wan',
+		proto = 'batadv',
+		mesh = 'bat0',
+		auto = site.batman_on_wan,
+	}
+)
+
+c:save('network')
+c:commit('network')
diff --git a/ffpb/gluon-batman-on-wan/generate/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan b/ffpb/gluon-batman-on-wan/generate/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan
deleted file mode 100644
index 0641f413ada651176514094a6e1ef3ac51d07503..0000000000000000000000000000000000000000
--- a/ffpb/gluon-batman-on-wan/generate/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-uci_add network interface mesh_wan
-uci_set network mesh_wan ifname 'br-wan'
-uci_set network mesh_wan proto 'batadv'
-uci_set network mesh_wan mesh 'bat0'
-uci_set network mesh_wan auto @batman_on_wan@
-
-uci_commit network