diff --git a/README.md b/README.md
index fe1973c..643a322 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ SoftwareSerial      | ❌              | ❌
 SPI                 | ❌              | ❌
 Wire                | ❗              | ❌
 **OTHER LIBRARIES** |                |
-Wi-Fi STA/AP/Mixed  | ✔️             | ✔️/❌/❌
+Wi-Fi STA/AP/Mixed  | ✔️             | ✔️
 Wi-Fi Events        | ✔️             | ❌
 TCP Client (SSL)    | ✔️ (✔️)        | ✔️ (❗)
 TCP Server          | ✔️             | ✔️
diff --git a/arduino/beken-72xx/libraries/WiFi/WiFiAP.cpp b/arduino/beken-72xx/libraries/WiFi/WiFiAP.cpp
new file mode 100644
index 0000000..4e42a4d
--- /dev/null
+++ b/arduino/beken-72xx/libraries/WiFi/WiFiAP.cpp
@@ -0,0 +1,112 @@
+/* Copyright (c) Kuba Szczodrzyński 2022-07-01. */
+
+#include "WiFiPriv.h"
+
+bool WiFiClass::softAP(const char *ssid, const char *passphrase, int channel, bool ssidHidden, int maxClients) {
+	if (!enableAP(true))
+		return WL_CONNECT_FAILED;
+	if (!validate(ssid, passphrase))
+		return WL_CONNECT_FAILED;
+
+	LT_HEAP_I();
+
+	strcpy(AP_CFG->wifi_ssid, ssid);
+	if (passphrase) {
+		strcpy(AP_CFG->wifi_key, passphrase);
+		AP_CFG->security = BK_SECURITY_TYPE_WPA2_MIXED;
+	} else {
+		AP_CFG->wifi_key[0] = '\0';
+		AP_CFG->security	= BK_SECURITY_TYPE_NONE;
+	}
+
+	AP_CFG->channel				= channel;
+	AP_CFG->ssid_hidden			= ssidHidden;
+	AP_CFG->max_con				= maxClients;
+	AP_CFG->dhcp_mode			= DHCP_SERVER;
+	AP_CFG->wifi_retry_interval = 100;
+
+	LT_I("Creating SoftAP %s", ssid);
+
+	__wrap_bk_printf_disable();
+	OSStatus ret = bk_wlan_start_ap_adv(AP_CFG);
+	__wrap_bk_printf_enable();
+
+	if (ret != 0) {
+		LT_E("SoftAP failed; ret=%d", ret);
+		return false;
+	}
+	LT_D_WG("Start OK");
+	return true;
+}
+
+bool WiFiClass::softAPConfig(IPAddress localIP, IPAddress gateway, IPAddress subnet) {
+	if (!localIP) {
+		localIP = gateway = IPAddress(192, 168, 43, 1);
+		subnet			  = IPAddress(255, 255, 255, 0);
+	}
+	sprintf(AP_CFG->local_ip_addr, IP_FMT, localIP[0], localIP[1], localIP[2], localIP[3]);
+	sprintf(AP_CFG->net_mask, IP_FMT, subnet[0], subnet[1], subnet[2], subnet[3]);
+	sprintf(AP_CFG->gateway_ip_addr, IP_FMT, gateway[0], gateway[1], gateway[2], gateway[3]);
+	// from wlan_ui.c:1370
+	if (uap_ip_is_start()) {
+		uap_ip_down();
+		ip_address_set(
+			BK_STATION,
+			AP_CFG->dhcp_mode,
+			AP_CFG->local_ip_addr,
+			AP_CFG->net_mask,
+			AP_CFG->gateway_ip_addr,
+			AP_CFG->dns_server_ip_addr
+		);
+		uap_ip_start();
+	}
+	return true;
+}
+
+bool WiFiClass::softAPdisconnect(bool wifiOff) {
+	return bk_wlan_stop(BK_SOFT_AP) == kNoErr;
+}
+
+uint8_t WiFiClass::softAPgetStationNum() {
+	return 0;
+}
+
+IPAddress WiFiClass::softAPIP() {
+	bk_wlan_get_ip_status(IP_STATUS, BK_SOFT_AP);
+	IPAddress ip;
+	ip.fromString(IP_STATUS->ip);
+	return ip;
+}
+
+IPAddress WiFiClass::softAPSubnetMask() {
+	bk_wlan_get_ip_status(IP_STATUS, BK_SOFT_AP);
+	IPAddress ip;
+	ip.fromString(IP_STATUS->mask);
+	return ip;
+}
+
+const char *WiFiClass::softAPgetHostname() {
+	struct netif *ifs = (struct netif *)net_get_uap_handle();
+	return netif_get_hostname(ifs);
+}
+
+bool WiFiClass::softAPsetHostname(const char *hostname) {
+	struct netif *ifs = (struct netif *)net_get_uap_handle();
+	netif_set_hostname(ifs, (char *)hostname);
+	return true;
+}
+
+uint8_t *WiFiClass::softAPmacAddress(uint8_t *mac) {
+	setMacAddress(mac);
+	return mac;
+}
+
+String WiFiClass::softAPmacAddress(void) {
+	uint8_t mac[ETH_ALEN];
+	wifi_get_mac_address((char *)mac, CONFIG_ROLE_AP);
+	return macToString(mac);
+}
+
+const String WiFiClass::softAPSSID(void) {
+	return AP_CFG->wifi_ssid;
+}
diff --git a/arduino/beken-72xx/libraries/WiFi/WiFiSTA.cpp b/arduino/beken-72xx/libraries/WiFi/WiFiSTA.cpp
index 431b721..916ce32 100644
--- a/arduino/beken-72xx/libraries/WiFi/WiFiSTA.cpp
+++ b/arduino/beken-72xx/libraries/WiFi/WiFiSTA.cpp
@@ -156,7 +156,19 @@ uint8_t *WiFiClass::macAddress(uint8_t *mac) {
 }
 
 bool WiFiClass::setMacAddress(const uint8_t *mac) {
-	wifi_set_mac_address((char *)mac);
+	if (mac[0] & 0x01) {
+		LT_E("Invalid MAC address");
+		return false;
+	}
+	// ensure "mac_inited" is true
+	wifi_get_mac_address((char *)system_mac, BK_STATION);
+	// store the MAC globally
+	memcpy(system_mac, mac, 6);
+	WiFiMode previousMode = getMode();
+	if (previousMode) {
+		mode(WIFI_MODE_NULL);
+		mode(previousMode);
+	}
 	return true;
 }
 
diff --git a/boards/generic-native/README.md b/boards/generic-native/README.md
index 8f332c5..a751f53 100644
--- a/boards/generic-native/README.md
+++ b/boards/generic-native/README.md
@@ -2,6 +2,8 @@
 
 *by N/A*
 
+[Product page](https://kuba2k2.github.io/libretuya/)
+
 Parameter    | Value
 -------------|-------
 MCU          | NATIVE