diff --git a/admin/zabbix/files/zabbix_agentd.init b/admin/zabbix/files/zabbix_agentd.init
index 3c70009d1..ed9acabb9 100644
--- a/admin/zabbix/files/zabbix_agentd.init
+++ b/admin/zabbix/files/zabbix_agentd.init
@@ -3,23 +3,31 @@
 
 START=60
 
-SERVICE_PID_FILE=/var/run/zabbix/zabbix_agentd.pid
+PROG=/usr/sbin/zabbix_agentd
+CONFIG=/etc/zabbix_agentd.conf
+SERVICE_PID_FILE=/var/run/zabbix_agentd.pid
 
 start() {
-	[ -f /etc/zabbix/zabbix_agentd.conf ] || return 1
-	user_exists zabbix 53 || user_add zabbix 53
-	group_exists zabbix 53 || group_add zabbix 53
-	[ -d /var/log/zabbix ] || {
-		mkdir -m0755 -p /var/log/zabbix
-		chown zabbix:zabbix /var/log/zabbix
+	# Sometimes the agentd config was installed in /etc/zabbix/zabbix_agentd.conf
+	[ -f /etc/zabbix/zabbix_agentd.conf ] && mv /etc/zabbix/zabbix_agentd.conf ${CONFIG}
+
+	[ -f ${CONFIG} ] || return 1
+
+	grep -q "^PidFile=${SERVICE_PID_FILE}" ${CONFIG} || {
+		logger -s -t ${CONFIG} -p daemon.error "Only \"PidFile=${SERVICE_PID_FILE}\" supported"
+		return 1
 	}
-	[ -d /var/run/zabbix ] || {
-		mkdir -m0755 -p /var/run/zabbix
-		chown zabbix:zabbix /var/run/zabbix
+
+	grep -q "^AllowRoot=1" ${CONFIG} || {
+		user_exists zabbix 53 || user_add zabbix 53
+		group_exists zabbix 53 || group_add zabbix 53
+		touch ${SERVICE_PID_FILE}
+		chown zabbix:zabbix ${SERVICE_PID_FILE}
 	}
-	service_start /usr/sbin/zabbix_agentd
+
+	service_start ${PROG} -c ${CONFIG}
 }
 
 stop() {
-	service_stop /usr/sbin/zabbix_agentd
+	service_stop ${PROG}
 }
diff --git a/admin/zabbix/patches/010-change-agentd-config.patch b/admin/zabbix/patches/010-change-agentd-config.patch
new file mode 100644
index 000000000..bff3b0416
--- /dev/null
+++ b/admin/zabbix/patches/010-change-agentd-config.patch
@@ -0,0 +1,54 @@
+diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf
+index ed04751..e714c4d 100644
+--- a/conf/zabbix_agentd.conf
++++ b/conf/zabbix_agentd.conf
+@@ -3,12 +3,8 @@
+ 
+ ############ GENERAL PARAMETERS #################
+ 
+-### Option: PidFile
+-#	Name of PID file.
+-#
+-# Mandatory: no
+-# Default:
+-# PidFile=/tmp/zabbix_agentd.pid
++# Only /var/run/zabbix_agentd.pid supported
++PidFile=/var/run/zabbix_agentd.pid
+ 
+ ### Option: LogFile
+ #	Name of log file.
+@@ -18,8 +14,6 @@
+ # Default:
+ # LogFile=
+ 
+-LogFile=/tmp/zabbix_agentd.log
+-
+ ### Option: LogFileSize
+ #	Maximum size of log file in MB.
+ #	0 - disable automatic log rotation.
+@@ -105,6 +99,7 @@ Server=127.0.0.1
+ # Range: 0-100
+ # Default:
+ # StartAgents=3
++StartAgents=1
+ 
+ ##### Active checks related
+ 
+@@ -120,8 +115,6 @@ Server=127.0.0.1
+ # Default:
+ # ServerActive=
+ 
+-ServerActive=127.0.0.1
+-
+ ### Option: Hostname
+ #	Unique, case sensitive hostname.
+ #	Required for active checks and must match hostname as configured on the server.
+@@ -131,8 +124,6 @@ ServerActive=127.0.0.1
+ # Default:
+ # Hostname=
+ 
+-Hostname=Zabbix server
+-
+ ### Option: HostnameItem
+ #	Item used for generating Hostname if it is undefined.
+ #	Ignored if Hostname is defined.