diff --git a/package/gluon-mesh-olsr12-vxlan/Makefile b/package/gluon-mesh-olsr12-vxlan/Makefile
new file mode 100644
index 00000000..003a297c
--- /dev/null
+++ b/package/gluon-mesh-olsr12-vxlan/Makefile
@@ -0,0 +1,13 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gluon-mesh-olsr12-vxlan
+PKG_VERSION=1
+
+include ../gluon.mk
+
+define Package/gluon-mesh-olsr12-vxlan
+  TITLE:=olsrd v1 to v2 migration fallback vpn
+  DEPENDS:= +gluon-mesh-olsrd +vxlan
+endef
+
+$(eval $(call BuildPackageGluon,gluon-mesh-olsr12-vxlan))
diff --git a/package/gluon-mesh-olsr12-vxlan/check_site.lua b/package/gluon-mesh-olsr12-vxlan/check_site.lua
new file mode 100644
index 00000000..4540445d
--- /dev/null
+++ b/package/gluon-mesh-olsr12-vxlan/check_site.lua
@@ -0,0 +1,4 @@
+if need_boolean({'mesh', 'olsrd', 'olsr12', 'enable'}, false) then
+  need_number({'mesh', 'olsrd', 'olsr12', 'port'}, false)
+  need_string({'mesh', 'olsrd', 'olsr12', 'server'})
+end
diff --git a/package/gluon-mesh-olsr12-vxlan/luasrc/lib/gluon/upgrade/380-gluon-mesh-olsr12-vxlan b/package/gluon-mesh-olsr12-vxlan/luasrc/lib/gluon/upgrade/380-gluon-mesh-olsr12-vxlan
new file mode 100755
index 00000000..255486f1
--- /dev/null
+++ b/package/gluon-mesh-olsr12-vxlan/luasrc/lib/gluon/upgrade/380-gluon-mesh-olsr12-vxlan
@@ -0,0 +1,40 @@
+#!/usr/bin/lua
+
+local uci = require('simple-uci').cursor()
+local site = require 'gluon.site'
+local util = require 'gluon.util'
+local wireless = require 'gluon.wireless'
+local sysconfig = require 'gluon.sysconfig'
+local util = require 'gluon.util'
+local olsrd = require 'gluon.olsrd'
+
+if site.mesh.olsrd.olsr12.enable() then
+	-- TODO: gluon_wired once added in mesh-olsrd
+	uci:section('network', 'interface', 'olsr12', {
+		proto = 'vxlan',
+		vid = 111,
+
+		port = site.mesh.olsrd.olsr12.port(598),
+		peeraddr = site.mesh.olsrd.olsr12.server(),
+
+		mtu = 1300,
+
+		zone = 'mesh',
+	})
+
+	uci:section('olsrd2', 'interface', 'olsr12_mesh', {
+		ifname = { 'olsr12' },
+		bindto = uci:get_list('olsrd2', 'wired_mesh', 'bindto'),
+		-- TODO: link quality
+	})
+
+	local intfs = uci:get_list('firewall', 'mesh', 'network')
+
+	table.insert(intfs, 'olsr12')
+
+	uci:set_list('firewall', 'mesh', 'network', intfs)
+end
+
+uci:save('olsrd2')
+uci:save('firewall')
+uci:save('network')