Index: src/libs/zbxcommon/Makefile.am
===================================================================
--- src/libs/zbxcommon/Makefile.am	(revision 35158)
+++ src/libs/zbxcommon/Makefile.am	(working copy)
@@ -11,6 +11,7 @@
 	time.c \
 	zbxgetopt.c \
 	alias.c \
-	file.c
+	file.c \
+	setproctitle.c
 
 EXTRA_DIST = gnuregex.c
Index: src/libs/zbxcommon/misc.c
===================================================================
--- src/libs/zbxcommon/misc.c	(revision 35158)
+++ src/libs/zbxcommon/misc.c	(working copy)
@@ -346,15 +346,17 @@
  ******************************************************************************/
 void	__zbx_zbx_setproctitle(const char *fmt, ...)
 {
-#ifdef HAVE_FUNCTION_SETPROCTITLE
-	char	title[MAX_STRING_LEN];
-	va_list	args;
+        char    title[MAX_STRING_LEN];
+        va_list args;
 
-	va_start(args, fmt);
-	zbx_vsnprintf(title, sizeof(title), fmt, args);
-	va_end(args);
+        va_start(args, fmt);
+        zbx_vsnprintf(title, sizeof(title), fmt, args);
+        va_end(args);
 
-	setproctitle(title);
+#ifdef HAVE_FUNCTION_SETPROCTITLE
+        setproctitle(title);
+#else
+        set_ps_display(title);
 #endif
 }
 
Index: src/zabbix_agent/zabbix_agentd.c
===================================================================
--- src/zabbix_agent/zabbix_agentd.c	(revision 35158)
+++ src/zabbix_agent/zabbix_agentd.c	(working copy)
@@ -738,6 +738,10 @@
 			break;
 	}
 
+        argv = save_ps_display_args(argc, argv);
+
+        init_ps_display("Zabbix Agentd");
+
 	START_MAIN_ZABBIX_ENTRY(CONFIG_ALLOW_ROOT);
 
 	exit(SUCCEED);
Index: src/zabbix_proxy/proxy.c
===================================================================
--- src/zabbix_proxy/proxy.c	(revision 35158)
+++ src/zabbix_proxy/proxy.c	(working copy)
@@ -498,6 +498,10 @@
 		}
 	}
 
+        argv = save_ps_display_args(argc, argv);
+
+        init_ps_display("Zabbix Proxy");
+
 	if (NULL == CONFIG_FILE)
 		CONFIG_FILE = zbx_strdup(CONFIG_FILE, SYSCONFDIR "/zabbix_proxy.conf");
 
Index: src/zabbix_server/server.c
===================================================================
--- src/zabbix_server/server.c	(revision 35158)
+++ src/zabbix_server/server.c	(working copy)
@@ -466,6 +466,10 @@
 		}
 	}
 
+        argv = save_ps_display_args(argc, argv);
+
+        init_ps_display("Zabbix Server");
+
 	if (NULL == CONFIG_FILE)
 		CONFIG_FILE = zbx_strdup(CONFIG_FILE, SYSCONFDIR "/zabbix_server.conf");