diff --git a/tools/ocft/Xinetd b/tools/ocft/Xinetd
index ba9c85c7f..bff9f726d 100644
--- a/tools/ocft/Xinetd
+++ b/tools/ocft/Xinetd
@@ -1,56 +1,64 @@
 # Xinetd
 
 CONFIG
 	Agent Xinetd
 	AgentRoot /usr/lib/ocf/resource.d/heartbeat
 	InstallPackage xinetd
 
+SETUP-AGENT
+	sed -i /disable/s/yes/no/ /etc/xinetd.d/echo
+	if which rcxinetd >/dev/null 2>&1; then
+		rcxinetd start
+	elif systemctl list-unit-files | grep -qs xinetd; then
+		systemctl start xinetd
+	fi
+
 CASE-BLOCK required_args
 	Env OCF_RESKEY_service=discard
 
 CASE-BLOCK default_status
 	AgentRun stop
 
 CASE-BLOCK prepare
 	Include required_args
 	Include default_status
 
 CASE "check base env"
 	Include prepare
 	AgentRun start OCF_SUCCESS
 
 CASE "check base env: unset 'OCF_RESKEY_protocol'"
 	Include prepare
 	Unenv OCF_RESKEY_service
 	AgentRun start OCF_ERR_CONFIGURED
 
 CASE "normal start"
 	Include prepare
 	AgentRun start OCF_SUCCESS
 
 CASE "normal stop"
 	Include prepare
 	AgentRun start
 	AgentRun stop OCF_SUCCESS
 
 CASE "double start"
 	Include prepare
 	AgentRun start
 	AgentRun start OCF_SUCCESS
 
 CASE "double stop"
 	Include prepare
 	AgentRun stop OCF_SUCCESS
 
 CASE "monitor with running"
 	Include prepare
 	AgentRun start
 	AgentRun monitor OCF_SUCCESS
 
 CASE "monitor with not running"
 	Include prepare
 	AgentRun monitor OCF_NOT_RUNNING
 
 CASE "unimplemented command"
 	Include prepare
 	AgentRun no_cmd OCF_ERR_UNIMPLEMENTED