diff --git a/autobuild_mac80211_release/lede-build-sanity.sh b/autobuild_mac80211_release/lede-build-sanity.sh
index d365a50..872f14a 100755
--- a/autobuild_mac80211_release/lede-build-sanity.sh
+++ b/autobuild_mac80211_release/lede-build-sanity.sh
@@ -218,6 +218,15 @@
 	rm -rf ${BUILD_DIR}/package/firmware/wireless-regdb
 	cp -fpR ${BUILD_DIR}/./../mac80211_package/package/firmware/wireless-regdb ${BUILD_DIR}/package/firmware
 
+	rm -rf ${BUILD_DIR}/package/utils/ucode
+	cp -fpR ${BUILD_DIR}/./../mac80211_package/package/utils/ucode ${BUILD_DIR}/package/utils
+	rm -rf ${BUILD_DIR}/package/libs/libubox
+	cp -fpR ${BUILD_DIR}/./../mac80211_package/package/libs/libubox ${BUILD_DIR}/package/libs
+	rm -rf ${BUILD_DIR}/package/system/rpcd
+	cp -fpR ${BUILD_DIR}/./../mac80211_package/package/system/rpcd ${BUILD_DIR}/package/system
+	rm -rf ${BUILD_DIR}/package/system/procd
+	cp -fpR ${BUILD_DIR}/./../mac80211_package/package/system/procd ${BUILD_DIR}/package/system
+
 	# do not directly remove mt76 folder, since the firmware folder will also be removed and enter an unsync state
 	rm -rf ${BUILD_DIR}/package/kernel/mt76/Makefile
 	rm -rf ${BUILD_DIR}/package/kernel/mt76/patches
diff --git a/autobuild_mac80211_release/package/network/utils/iwinfo/Makefile b/autobuild_mac80211_release/package/network/utils/iwinfo/Makefile
deleted file mode 100644
index 590ee05..0000000
--- a/autobuild_mac80211_release/package/network/utils/iwinfo/Makefile
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# Copyright (C) 2010-2016 Jo-Philipp Wich <jo@mein.io>
-#
-# This is free software, licensed under the GPL 2 license.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libiwinfo
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git
-PKG_SOURCE_DATE:=2022-11-01
-PKG_SOURCE_VERSION:=00aab871c50d944fd83269e460e69124cb11adb7
-PKG_MIRROR_HASH:=e915d53da916db333d62c396154612ed7557fbb27ed8884e70c19c321c08b12c
-PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
-PKG_LICENSE:=GPL-2.0
-
-IWINFO_ABI_VERSION:=20210430
-
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/libiwinfo
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Generalized Wireless Information Library (iwinfo)
-  DEPENDS:=+libnl-tiny +libuci +libubus +libiwinfo-data
-  ABI_VERSION:=$(IWINFO_ABI_VERSION)
-endef
-
-define Package/libiwinfo/description
-  Wireless information library with simplified API for nl80211
-  and wext driver interfaces.
-endef
-
-
-define Package/libiwinfo-lua
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=libiwinfo Lua binding
-  DEPENDS:=+libiwinfo +liblua
-endef
-
-define Package/libiwinfo-lua/description
-  This is the Lua binding for the iwinfo library. It provides access to all enabled
-  backends.
-endef
-
-
-define Package/libiwinfo-data
-  TITLE:=libiwinfo Lua binding
-  HIDDEN:=1
-endef
-
-
-define Package/iwinfo
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Generalized Wireless Information utility
-  DEPENDS:=+libiwinfo
-endef
-
-define Package/iwinfo/description
-  Command line frontend for the wireless information library.
-endef
-
-
-define Build/Configure
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include/libnl-tiny \
-	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE
-
-MAKE_FLAGS += \
-	FPIC="$(FPIC)" \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	BACKENDS="nl80211" \
-	SOVERSION="$(IWINFO_ABI_VERSION)"
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/iwinfo
-	$(CP) $(PKG_BUILD_DIR)/include/iwinfo.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/include/iwinfo/* $(1)/usr/include/iwinfo/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libiwinfo.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iwinfo.so $(1)/usr/lib/lua/iwinfo.so
-endef
-
-define Package/libiwinfo/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libiwinfo.so.$(IWINFO_ABI_VERSION) $(1)/usr/lib/libiwinfo.so.$(IWINFO_ABI_VERSION)
-endef
-
-define Package/libiwinfo-lua/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iwinfo.so $(1)/usr/lib/lua/iwinfo.so
-endef
-
-define Package/libiwinfo-data/install
-	$(INSTALL_DIR) $(1)/usr/share/libiwinfo
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/devices.txt $(1)/usr/share/libiwinfo/devices.txt
-endef
-
-define Package/iwinfo/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iwinfo $(1)/usr/bin/iwinfo
-endef
-
-$(eval $(call BuildPackage,libiwinfo))
-$(eval $(call BuildPackage,libiwinfo-lua))
-$(eval $(call BuildPackage,libiwinfo-data))
-$(eval $(call BuildPackage,iwinfo))
diff --git a/autobuild_mac80211_release/package/utils/ucode/patches/0001-change-cmakelist.patch b/autobuild_mac80211_release/package/utils/ucode/patches/0001-change-cmakelist.patch
new file mode 100644
index 0000000..2770833
--- /dev/null
+++ b/autobuild_mac80211_release/package/utils/ucode/patches/0001-change-cmakelist.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d8dd34a..07e37a5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,8 +23,8 @@ OPTION(FS_SUPPORT "Filesystem plugin support" ON)
+ OPTION(MATH_SUPPORT "Math plugin support" ON)
+ OPTION(UBUS_SUPPORT "Ubus plugin support" ON)
+ OPTION(UCI_SUPPORT "UCI plugin support" ON)
+-OPTION(RTNL_SUPPORT "Route Netlink plugin support" ${LINUX})
+-OPTION(NL80211_SUPPORT "Wireless Netlink plugin support" ${LINUX})
++OPTION(RTNL_SUPPORT "Route Netlink plugin support" ON)
++OPTION(NL80211_SUPPORT "Wireless Netlink plugin support" ON)
+ OPTION(RESOLV_SUPPORT "NS resolve plugin support" ON)
+ OPTION(STRUCT_SUPPORT "Struct plugin support" ON)
+ OPTION(ULOOP_SUPPORT "Uloop plugin support" ON)