diff --git a/ieee1905/Config.in b/ieee1905/Config.in
index 926c89743..6a8f91c39 100644
--- a/ieee1905/Config.in
+++ b/ieee1905/Config.in
@@ -21,6 +21,9 @@ config IEEE1905_WIFI_EASYMESH
 config IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
 	bool "Fragment large CMDU frame at TLV boundary instead of octet boundary"
 
+config IEEE1905_BUILD_TR181_PLUGIN
+	bool "Build TR-181 mapping module (responsible for Device.IEEE1905.)"
+
 endmenu
 
 endif
diff --git a/ieee1905/Makefile b/ieee1905/Makefile
index e64a60ce0..e2ec454c5 100644
--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.5.9
+PKG_VERSION:=8.6.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c86d5b0c596d4154b4980487353f62c42e694cd3
+PKG_SOURCE_VERSION:=e622f9d5e37a67daaa93e3dea480ddd44cba5f10
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -97,6 +97,7 @@ TARGET_CFLAGS += -DEXTENSION_ALLOWED
 endif
 
 TARGET_CFLAGS += -DHAS_UBUS
+TARGET_CFLAGS += -DBUILD_TR181_PLUGIN
 
 MAKE_FLAGS += \
 	extmod_subdirs="$(patsubst %,extensions/%,$(plugins))"