diff --git a/client.c b/client.c
index 3625da3f..73c3358c 100644
--- a/client.c
+++ b/client.c
@@ -1,4 +1,4 @@
-/* $Id: client.c,v 1.99 2010-10-24 01:31:08 tcunha Exp $ */
+/* $Id: client.c,v 1.100 2010-10-24 19:54:41 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -157,7 +157,9 @@ client_main(int argc, char **argv, int flags)
 	}
 
 	/* Set process title, log and signals now this is the client. */
+#ifdef HAVE_SETPROCTITLE
 	setproctitle("client (%s)", socket_path);
+#endif
 	logfile("client");
 
 	/* Create imsg. */
diff --git a/server.c b/server.c
index 2fd820bf..f1f9dce0 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.247 2010-10-24 01:31:08 tcunha Exp $ */
+/* $Id: server.c,v 1.248 2010-10-24 19:54:41 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -155,7 +155,9 @@ server_start(void)
 
 	start_time = time(NULL);
 	log_debug("socket path %s", socket_path);
+#ifdef HAVE_SETPROCTITLE
 	setproctitle("server (%s)", socket_path);
+#endif
 
 	server_fd = server_create_socket();
 	server_client_create(pair[1]);
diff --git a/tmux.c b/tmux.c
index e02041c6..dd1d612c 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.220 2010-10-24 01:31:08 tcunha Exp $ */
+/* $Id: tmux.c,v 1.221 2010-10-24 19:54:41 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -471,8 +471,10 @@ main(int argc, char **argv)
 		strlcpy(socket_path, path, sizeof socket_path);
 	xfree(path);
 
+#ifdef HAVE_SETPROCTITLE
 	/* Set process title. */
 	setproctitle("%s (%s)", __progname, socket_path);
+#endif
 
 	/* Pass control to the client. */
 #ifdef HAVE_BROKEN_KQUEUE