diff --git a/utils/domoticz/Makefile b/utils/domoticz/Makefile
index 4a350dbce..dc0420029 100644
--- a/utils/domoticz/Makefile
+++ b/utils/domoticz/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=domoticz
 PKG_VERSION_MAJOR:=3
 PKG_VERSION_PATCH:=5877
 PKG_VERSION:=$(PKG_VERSION_MAJOR).$(PKG_VERSION_PATCH)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/domoticz/domoticz/archive/$(PKG_VERSION)/$(PKG_SOURCE)
diff --git a/utils/domoticz/files/domoticz.init b/utils/domoticz/files/domoticz.init
index cbee77b5c..d714b9738 100644
--- a/utils/domoticz/files/domoticz.init
+++ b/utils/domoticz/files/domoticz.init
@@ -19,7 +19,12 @@ start_domoticz() {
 
 	[ -n "$loglevel" ] && procd_append_param command -loglevel "$loglevel"
 	[ -n "$syslog" ] && procd_append_param command -syslog "$syslog"
-	[ -n "$userdata" ] && procd_append_param command -userdata "$userdata"
+	[ -n "$userdata" ] && {
+		mkdir -p "$userdata"
+		chmod 0770 "$userdata"
+		chown domoticz:domoticz "$userdata"
+		procd_append_param command -userdata "$userdata"
+	}
 	[ -n "$sslcert" -a "${sslwww:-0}" -gt 0 ] && {
 		procd_append_param command -sslcert "$sslcert"
 		procd_append_param command -sslwww "$sslwww"
@@ -29,10 +34,6 @@ start_domoticz() {
 }
 
 start_service() {
-	mkdir -p /var/lib/domoticz
-	chmod 0770 /var/lib/domoticz
-	chown domoticz:domoticz /var/lib/domoticz
-
 	procd_open_instance
 
 	procd_set_param command "$PROG"