diff --git a/.gitmodules b/.gitmodules
index 5647056..0e153bd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,3 +46,6 @@
 [submodule "lvgl/lv_examples"]
 	path = lvgl/lv_examples
 	url = https://github.com/littlevgl/lv_examples.git
+[submodule "extras/wifi-config-v2"]
+	path = extras/wifi-config-v2
+	url = https://github.com/maximkulkin/esp-wifi-config.git
diff --git a/examples/wifi-config-v2/Makefile b/examples/wifi-config-v2/Makefile
new file mode 100644
index 0000000..7d82827
--- /dev/null
+++ b/examples/wifi-config-v2/Makefile
@@ -0,0 +1,18 @@
+# Makefile for wificfg example
+PROGRAM=wifi-config-v2
+EXTRA_COMPONENTS=extras/wifi-config-v2 extras/http-parser extras/dhcpserver
+
+# For the mDNS responder included under extras:
+#EXTRA_COMPONENTS += extras/mdnsresponder
+#EXTRA_CFLAGS += -DEXTRAS_MDNS_RESPONDER
+
+# For the mDNS responder included with lwip:
+EXTRA_CFLAGS += -DLWIP_MDNS_RESPONDER=1 -DLWIP_NUM_NETIF_CLIENT_DATA=1 -DLWIP_NETIF_EXT_STATUS_CALLBACK=1
+
+# Avoid writing the wifi state to flash when using wificfg.
+EXTRA_CFLAGS += -DWIFI_PARAM_SAVE=0
+
+# enable debugging for the wifi config tasks
+EXTRA_CFLAGS += -DWIFI_CONFIG_DEBUG
+
+include ../../common.mk
diff --git a/examples/wifi-config-v2/main.c b/examples/wifi-config-v2/main.c
new file mode 100644
index 0000000..17392f9
--- /dev/null
+++ b/examples/wifi-config-v2/main.c
@@ -0,0 +1,19 @@
+#include <stdio.h>
+#include <esp/uart.h>
+
+#include "wifi_config.h"
+
+
+void on_wifi_event(wifi_config_event_t event) {
+    if (event == WIFI_CONFIG_CONNECTED) {
+        printf("Connected to WiFi\n");
+    } else if (event == WIFI_CONFIG_DISCONNECTED) {
+        printf("Disconnected from WiFi\n");
+    }
+}
+
+void user_init(void) {
+    uart_set_baud(0, 115200);
+
+    wifi_config_init2("my-accessory", NULL, on_wifi_event);
+}
\ No newline at end of file
diff --git a/extras/wifi-config-v2 b/extras/wifi-config-v2
new file mode 160000
index 0000000..0b385c6
--- /dev/null
+++ b/extras/wifi-config-v2
@@ -0,0 +1 @@
+Subproject commit 0b385c69a001db475e8152080f33c8afa0395784