diff --git a/bridgemngr/Config.in b/bridgemngr/Config.in
new file mode 100644
index 000000000..b5167e00d
--- /dev/null
+++ b/bridgemngr/Config.in
@@ -0,0 +1,11 @@
+if PACKAGE_bridgemngr
+
+menu "Configuration"
+
+config BRIDGEMNGR_BRIDGE_VLAN
+	bool "Use bridge-vlan backend"
+	help
+	   Set this option to use bridge-vlan as backend for VLAN objects.
+
+endmenu
+endif
diff --git a/bridgemngr/Makefile b/bridgemngr/Makefile
index db8853db7..fa641765d 100644
--- a/bridgemngr/Makefile
+++ b/bridgemngr/Makefile
@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bridgemngr
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.4
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/bridgemngr
-PKG_SOURCE_VERSION:=d79604697ad023dc2b186ece7ea7210980288a36
+PKG_SOURCE_VERSION:=20fa0b3fa1dfe3d5bdc034b850076d835d838f0d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -33,10 +33,18 @@ define Package/bridgemngr/description
 	Package to add Device.Bridging. data model support.
 endef
 
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
 MAKE_PATH:=src
 
 TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
 
+ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VLAN),y)
+	TARGET_CFLAGS += -DBRIDGE_VLAN_BACKEND
+endif
+
 define Package/bridgemngr/install
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libbridgemngr.so $(1) $(PKG_NAME)
 ifeq ($(findstring iopsys,$(CONFIG_BBF_VENDOR_LIST)),iopsys)