diff --git a/wfadatad/Makefile b/wfadatad/Makefile
index 00302a1a2..ef7c8fde8 100644
--- a/wfadatad/Makefile
+++ b/wfadatad/Makefile
@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=3.0.5
+PKG_VERSION:=3.1.0
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=477351a03190b09a050297c0456e2e74ddde4bd6
+PKG_SOURCE_VERSION:=6ee86bf2138edd680cc13f9d364f3e272a9e1e7c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
@@ -59,7 +59,7 @@ define Package/wfadatad/install
 ifeq ($(CONFIG_WFA_DELM_STANDALONE),y)
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/wfa_delm.init $(1)/etc/init.d/wfadatad
+	$(INSTALL_BIN) ./files/wfadatad.init $(1)/etc/init.d/wfadatad
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wfadatad $(1)/usr/sbin/
 else
 	$(INSTALL_DIR) $(1)/usr/lib/map-plugins
diff --git a/wfadatad/files/wfa_delm.init b/wfadatad/files/wfa_delm.init
deleted file mode 100644
index 4e0b98291..000000000
--- a/wfadatad/files/wfa_delm.init
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=98
-STOP=11
-
-USE_PROCD=1
-PROG=/usr/sbin/wfadatad
-
-service_running() {
-	ubus -t 2 wait_for ieee1905
-}
-
-start_service() {
-	procd_open_instance
-	procd_set_param command ${PROG}
-	procd_set_param respawn
-	procd_close_instance
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger wireless
-}
diff --git a/wfadatad/files/wfadatad.init b/wfadatad/files/wfadatad.init
new file mode 100644
index 000000000..f5775fbdf
--- /dev/null
+++ b/wfadatad/files/wfadatad.init
@@ -0,0 +1,41 @@
+#!/bin/sh /etc/rc.common
+
+START=98
+STOP=11
+
+USE_PROCD=1
+PROG=/usr/sbin/wfadatad
+
+service_running() {
+	ubus -t 2 wait_for ieee1905 map.1905
+}
+
+start_service() {
+	procd_open_instance
+	procd_set_param command "$PROG" "-d"
+	#procd_set_param respawn
+	procd_close_instance
+
+	[ -e "/etc/config/mapcontroller" ] && {
+		local en
+
+		config_load mapcontroller
+		config_get en "mapcontroller" "enabled" "0"
+
+		[ $en -gt 0 ] && {
+			procd_open_instance
+			procd_set_param command "$PROG" "-d -C"
+			procd_close_instance
+		}
+	}
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger wireless
+}