diff --git a/map-controller/Makefile b/map-controller/Makefile
index 8bf4f89be..7343cc638 100644
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.3.0.6
+PKG_VERSION:=4.3.0.7
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=cadbccc7654a40f16f96f2c48e584b998c03620e
+PKG_SOURCE_VERSION:=8186db3bc0798b949f7e54612844afabae022ab7
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 LOCAL_DEV=0
diff --git a/map-controller/files/etc/init.d/mapcontroller b/map-controller/files/etc/init.d/mapcontroller
index af7bc6a15..dba2f459d 100755
--- a/map-controller/files/etc/init.d/mapcontroller
+++ b/map-controller/files/etc/init.d/mapcontroller
@@ -155,6 +155,10 @@ validate_controller_config() {
 	return 0
 }
 
+create_dir() {
+	mkdir -p /etc/multiap
+}
+
 start_service() {
 	local enabled
 
@@ -164,6 +168,8 @@ start_service() {
 	config_get_bool enabled controller enabled 1
 	[ "$enabled" -eq 0 ] && return
 
+	create_dir
+
 	procd_open_instance
 	procd_set_param command "/usr/sbin/mapcontroller" "-d"