diff --git a/map-controller/Config.in b/map-controller/Config.in
index 2f1c40ff9..0e577d347 100644
--- a/map-controller/Config.in
+++ b/map-controller/Config.in
@@ -15,6 +15,11 @@ config CONTROLLER_PROVISION_DISABLED_AP
 	bool "Enable vendor extension that provisions disabled APs to agents"
 	default n
 
+config CONTROLLER_PROVISION_BRIDGE
+	depends on CONTROLLER_EASYMESH_VENDOR_EXT
+	bool "Enable vendor extension that provisions custom bridge for APs to agents, if configured"
+	default n
+
 config CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	hex "Vendor OUI default"
 	default 0xB456FA
diff --git a/map-controller/Makefile b/map-controller/Makefile
index 632e90b06..cb4cf0a15 100644
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -6,9 +6,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.3.0.10
+PKG_VERSION:=6.3.0.11
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=4abd4db59e3bc5e19c263dba07a10d5326bfa98c
+PKG_SOURCE_VERSION:=e6e749d3865162399181ebc522126a42708adb16
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@genexis.eu>
 
 LOCAL_DEV=0
@@ -65,6 +65,9 @@ TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
 ifeq ($(CONFIG_CONTROLLER_PROVISION_DISABLED_AP),y)
 TARGET_CFLAGS += -DPROVISION_DISABLED_AP
 endif
+ifeq ($(CONFIG_CONTROLLER_PROVISION_BRIDGE),y)
+TARGET_CFLAGS += -DPROVISION_BRIDGE
+endif
 endif
 
 ifeq ($(CONFIG_CONTROLLER_PROPAGATE_PROBE_REQ),y)