diff --git a/ieee1905/Makefile b/ieee1905/Makefile
index 36b9e84f4..43fcaa5b5 100644
--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -1,36 +1,35 @@
 #
 # Copyright (C) 2020-2024 IOPSYS Software Solutions AB
+# Copyright (C) 2025 Genexis Sweden AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.7.8
+PKG_VERSION:=8.8.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9c507bfb7f45fad81097262f05dc7cd11760e6b0
+PKG_SOURCE_VERSION:=ca6872755f9e5fee18ad8e215d4e6b8c1046f7e0
 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
 endif
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
+PKG_LICENSE_FILES:=
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@genexis.eu>
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
 
-ifeq ($(CONFIG_IEEE1905_BUILD_TR181_PLUGIN),y)
-include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
-endif
 
 define Package/ieee1905/Default
   SECTION:=utils
   CATEGORY:=Utilities
-  SUBMENU:=IEEE-1905.1 stack
+  SUBMENU:=IEEE1905.1 stack
 endef
 
 define Package/ieee1905/config
@@ -42,6 +41,7 @@ define Package/libieee1905
   TITLE:=libieee1905.so (library for CMDU and TLV handling)
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +libwifiutils \
+	   +IEEE1905_PLATFORM_HAS_WIFI:libwifi \
 	   +iputils-arping
 endef
 
@@ -75,14 +75,12 @@ plugins := \
 
 ppkg:=$(patsubst plugins/%.mk,ieee1905-%-plugin,$(wildcard plugins/*.mk))
 
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
+ifeq ($(CONFIG_IEEE1905_BUILD_TR181_PLUGIN),y)
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
+endif
 
 ifeq ($(CONFIG_IEEE1905_PLATFORM_HAS_WIFI),y)
-TARGET_CFLAGS += -DHAS_WIFI
+CMAKE_OPTIONS += -DHAS_WIFI=ON
 endif
 
 ifeq ($(CONFIG_IEEE1905_CMDU_SA_IS_ALMAC),y)
@@ -98,37 +96,36 @@ TARGET_CFLAGS += -DIEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
 endif
 
 ifeq ($(CONFIG_IEEE1905_EXTENSION_ALLOWED),y)
-TARGET_CFLAGS += -DEXTENSION_ALLOWED
+CMAKE_OPTIONS += -DEXTENSION_ALLOWED=ON
 endif
 
-TARGET_CFLAGS += -DHAS_UBUS
-
 ifeq ($(CONFIG_IEEE1905_BUILD_TR181_PLUGIN),y)
-TARGET_CFLAGS += -DBUILD_TR181_PLUGIN
+CMAKE_OPTIONS += -DBUILD_TR181_PLUGIN=ON
 endif
 
+CMAKE_OPTIONS += -DHAS_UBUS=ON
+
 MAKE_FLAGS += \
 	extmod_subdirs="$(patsubst %,extensions/%,$(plugins))"
 
-MAKE_PATH:=src
-
+CMAKE_SOURCE_SUBDIR:=src
 
 define Package/ieee1905/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ieee1905d $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/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)
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/ieee1905dm.so $(1) $(PKG_NAME)
 endif
 endef
 
 define Package/libieee1905/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/libieee1905.so $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libieee1905.so $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libmidgen.so $(1)/usr/lib/
 endef
 
 define Build/InstallDev/libieee1905
@@ -141,8 +138,8 @@ define Build/InstallDev/libieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_wsc.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/timer_impl.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_extension.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/src/libieee1905.so $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libmidgen.so $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libieee1905.so $(1)/usr/lib/
 endef
 
 define Build/InstallDev
diff --git a/ieee1905/plugins/map.mk b/ieee1905/plugins/map.mk
index df9abee54..0198ee443 100644
--- a/ieee1905/plugins/map.mk
+++ b/ieee1905/plugins/map.mk
@@ -1,8 +1,8 @@
 define Package/ieee1905-map-plugin
-  $(call Package/ieee1905/Default)
-  TITLE:=Multi-AP plugin supporting WiFi-Alliance Easymesh standard
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
+	$(call Package/ieee1905/Default)
+	TITLE:=Multi-AP plugin supporting WiFi-Alliance Easymesh standard
+	DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+		 +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
 define Package/ieee1905-map-plugin/config
@@ -39,13 +39,13 @@ define Build/InstallDev/ieee1905-map-plugin
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/easymesh.h $(1)/usr/include/easymesh.h
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/map_module.h
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/cntlrsync.h $(1)/usr/include/cntlrsync.h
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
+	$(CP) $(PKG_BUILD_DIR)/map.so $(1)/usr/lib/ieee1905/map.so
+	$(CP) $(PKG_BUILD_DIR)/libmaputil.so $(1)/usr/lib/libmaputil.so
 endef
 
 define Package/ieee1905-map-plugin/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
+	$(CP) $(PKG_BUILD_DIR)/libmaputil.so $(1)/usr/lib/libmaputil.so
+	$(CP) $(PKG_BUILD_DIR)/map.so $(1)/usr/lib/ieee1905/map.so
 endef
diff --git a/ieee1905/plugins/snoop.mk b/ieee1905/plugins/snoop.mk
index 9ceacad6b..89ed66c4b 100644
--- a/ieee1905/plugins/snoop.mk
+++ b/ieee1905/plugins/snoop.mk
@@ -1,12 +1,12 @@
 define Package/ieee1905-snoop-plugin
-  $(call Package/ieee1905/Default)
-  TITLE:=Show all received 1905 CMDUs over UBUS
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
+	$(call Package/ieee1905/Default)
+	TITLE:=Show all received 1905 CMDUs over UBUS
+	DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+		 +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
 define Package/ieee1905-snoop-plugin/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/snoop/snoop.so $(1)/usr/lib/ieee1905/snoop.so
+	$(CP) $(PKG_BUILD_DIR)/snoop.so $(1)/usr/lib/ieee1905/snoop.so
 endef
diff --git a/ieee1905/plugins/topology.mk b/ieee1905/plugins/topology.mk
index d9f62b8c6..18cbfa0af 100644
--- a/ieee1905/plugins/topology.mk
+++ b/ieee1905/plugins/topology.mk
@@ -1,12 +1,12 @@
 define Package/ieee1905-topology-plugin
-  $(call Package/ieee1905/Default)
-  TITLE:=Build full network topology of the 1905 nodes only
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
+	$(call Package/ieee1905/Default)
+	TITLE:=Build full network topology of the 1905 nodes only
+	DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+		 +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
 define Package/ieee1905-topology-plugin/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/topology/topology.so $(1)/usr/lib/ieee1905/topology.so
+	$(CP) $(PKG_BUILD_DIR)/topology.so $(1)/usr/lib/ieee1905/topology.so
 endef