diff --git a/GNUmakefile b/GNUmakefile
index 629eb3ee..06866f79 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.20 2008-06-18 16:39:15 nicm Exp $
+# $Id: GNUmakefile,v 1.21 2008-06-18 19:34:50 nicm Exp $
 
 .PHONY: clean
 
@@ -51,6 +51,13 @@ INSTALLDIR= install -d
 INSTALLBIN= install -g bin -o root -m 555
 INSTALLMAN= install -g bin -o root -m 444
 
+ifeq ($(shell uname),SunOS)
+INCDIRS+= -Icompat
+SRCS+= compat/strtonum.c
+CFLAGS+= -DNO_STRTONUM -DNO_TREE_H -DNO_PATHS_H -DNO_SETPROCTITLE \
+	-DNO_DAEMON
+endif 
+
 ifeq ($(shell uname),Darwin)
 INCDIRS+= -Icompat
 SRCS+= compat/strtonum.c
diff --git a/client.c b/client.c
index 49041461..5e3e6496 100644
--- a/client.c
+++ b/client.c
@@ -1,4 +1,4 @@
-/* $Id: client.c,v 1.29 2008-06-07 07:27:28 nicm Exp $ */
+/* $Id: client.c,v 1.30 2008-06-18 19:34:50 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -24,7 +24,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <paths.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
diff --git a/server.c b/server.c
index ebbe578f..fbb07a04 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.66 2008-06-18 18:52:44 nicm Exp $ */
+/* $Id: server.c,v 1.67 2008-06-18 19:34:50 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -24,7 +24,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <paths.h>
 #include <poll.h>
 #include <signal.h>
 #include <stdio.h>
diff --git a/tmux.c b/tmux.c
index 9cf028f3..df9f2d2e 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.58 2008-06-18 18:52:44 nicm Exp $ */
+/* $Id: tmux.c,v 1.59 2008-06-18 19:34:50 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -20,7 +20,6 @@
 #include <sys/wait.h>
 
 #include <errno.h>
-#include <paths.h>
 #include <poll.h>
 #include <pwd.h>
 #include <signal.h>
@@ -29,6 +28,10 @@
 #include <syslog.h>
 #include <unistd.h>
 
+#ifndef NO_PATHS_H
+#include <paths.h>
+#endif
+
 #include "tmux.h"
 
 #ifdef DEBUG
diff --git a/tmux.h b/tmux.h
index c0057020..2430dd0f 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.145 2008-06-18 18:52:44 nicm Exp $ */
+/* $Id: tmux.h,v 1.146 2008-06-18 19:34:50 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -70,6 +70,11 @@ extern char    *__progname;
 #define TTY_NAME_MAX 32
 #endif
 
+#ifdef NO_PATHS_H
+#define	_PATH_BSHELL	"/bin/sh"
+#define	_PATH_TMP	"/tmp/"
+#endif
+
 /* Default configuration file. */
 #define DEFAULT_CFG ".tmux.conf"
 
diff --git a/window.c b/window.c
index 555b5274..81e28ce3 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.41 2008-06-14 16:47:20 nicm Exp $ */
+/* $Id: window.c,v 1.42 2008-06-18 19:34:50 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -20,7 +20,6 @@
 #include <sys/ioctl.h>
 
 #include <fcntl.h>
-#include <paths.h>
 #include <signal.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -28,6 +27,10 @@
 #include <termios.h>
 #include <unistd.h>
 
+#ifndef NO_PATHS_H
+#include <paths.h>
+#endif
+
 #ifdef USE_LIBUTIL_H
 #include <libutil.h>
 #else