diff --git a/map-agent/Config.in b/map-agent/Config.in
index 200909c49..eb2cd7273 100644
--- a/map-agent/Config.in
+++ b/map-agent/Config.in
@@ -62,5 +62,9 @@ config AGENT_CHECK_PARTIAL_WIFI_RELOAD
 config DYNBHD_DYNAMICALLY_PERSIST_CONTROLLER
 	bool "Let dynbhd through AP-Autoconfiguration Search and DHCP Discovery determine the controller or agent role"
 
+config AGENT_UNASSOC_STA_CONT_MONITOR
+	bool "Enable continuos monitoring of unassociated clients"
+	default n
+
 endmenu
 endif
diff --git a/map-agent/Makefile b/map-agent/Makefile
index 158acaf49..c7996e8fb 100644
--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.3.3.7
+PKG_VERSION:=6.3.3.8
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=0e8f7b6703d60647f0bd01f52a430f0443395ac4
+PKG_SOURCE_VERSION:=418ac71b7a49e82529dbfb2381b2b61b33056054
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -115,6 +115,10 @@ ifeq ($(CONFIG_DYNBHD_DYNAMICALLY_PERSIST_CONTROLLER),y)
 TARGET_CFLAGS += -DPERSIST_CONTROLLER
 endif
 
+ifeq ($(CONFIG_AGENT_UNASSOC_STA_CONT_MONITOR),y)
+TARGET_CFLAGS += -DUNASSOC_STA_CONT_MONITOR
+endif
+
 MAKE_PATH:=src
 
 define Package/map-agent/install