diff --git a/wifimngr/Makefile b/wifimngr/Makefile
index cad43cfd0..3904bad14 100644
--- a/wifimngr/Makefile
+++ b/wifimngr/Makefile
@@ -1,26 +1,26 @@
 #
-# Copyright (C) 2020-2023 Iopsys
-# Copyright (C) 2025 Genexis AB
+# Copyright (C) 2020-2024 Iopsys
+# Copyright (C) 2025 Genexis Sweden AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=17.7.8
+PKG_VERSION:=20.0.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=724804d57533a78033e0c59aa4e233489d0b425e
+PKG_SOURCE_VERSION:=5b1a033db5fc372a7e21bc896888ecbafb406d13
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/wifimngr.git
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@genexis.eu>
 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_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=LICENSE
+PKG_LICENSE_FILES:=
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@genexis.eu>
 
 PKG_CONFIG_DEPENDS := \
 		     CONFIG_PACKAGE_libwifiutils \
@@ -29,12 +29,13 @@ PKG_CONFIG_DEPENDS := \
 PKG_BUILD_DEPENDS := libwifi
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 define Package/wifimngr
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=WiFi status and configration utility
-  DEPENDS:=+libwifiutils +libwifi +libuci +libubox +ubus +libnl-genl
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=WiFi status and configration utility
+	DEPENDS:=+libwifiutils +libwifi +libuci +libubox +ubus +libnl-genl
 endef
 
 define Package/wifimngr/description
@@ -44,15 +45,6 @@ define Package/wifimngr/description
  exposed by the libwifi library.
 endef
 
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
-ifeq ($(CONFIG_WIFIMNGR_CACHE_SCANRESULTS),y)
-TARGET_CFLAGS += -DWIFI_CACHE_SCANRESULTS
-endif
-
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
   rsync -r --exclude=.* ~/git/wifimngr/ $(PKG_BUILD_DIR)/