diff --git a/ieee1905/Makefile b/ieee1905/Makefile
index c5bbe2875..3e2691928 100644
--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -22,8 +22,10 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
+ifeq ($(CONFIG_IEEE1905_BUILD_TR181_PLUGIN),y)
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
+endif
 
 define Package/ieee1905/Default
   SECTION:=utils
@@ -49,7 +51,9 @@ define Package/ieee1905
 	   +libjson-c +libblobmsg-json +ubus +libpthread \
 	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi \
 	   +libwifiutils
-  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
+  DEPENDS+=+IEEE1905_BUILD_TR181_PLUGIN:libbbfdm-api \
+	   +IEEE1905_BUILD_TR181_PLUGIN:libbbfdm-ubus \
+	   +IEEE1905_BUILD_TR181_PLUGIN:dm-service
 endef
 
 include $(wildcard plugins/*.mk)
@@ -97,7 +101,10 @@ TARGET_CFLAGS += -DEXTENSION_ALLOWED
 endif
 
 TARGET_CFLAGS += -DHAS_UBUS
+
+ifeq ($(CONFIG_IEEE1905_BUILD_TR181_PLUGIN),y)
 TARGET_CFLAGS += -DBUILD_TR181_PLUGIN
+endif
 
 MAKE_FLAGS += \
 	extmod_subdirs="$(patsubst %,extensions/%,$(plugins))"
@@ -111,8 +118,10 @@ define Package/ieee1905/install
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ieee1905d $(1)/usr/sbin/
+ifeq ($(CONFIG_IEEE1905_BUILD_TR181_PLUGIN),y)
 	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/tr181/ieee1905dm.so $(1) $(PKG_NAME)
+endif
 endef
 
 define Package/libieee1905/install