diff --git a/cmd-set-password.c b/cmd-set-password.c
index ae64b4c5..3b81d529 100644
--- a/cmd-set-password.c
+++ b/cmd-set-password.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-set-password.c,v 1.3 2009-01-19 18:23:40 nicm Exp $ */
+/* $Id: cmd-set-password.c,v 1.4 2009-05-14 07:49:23 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -23,6 +23,10 @@
 
 #include "tmux.h"
 
+#ifdef HAVE_CRYPT_H
+#include <crypt.h>
+#endif
+
 /*
  * Set server password.
  */
diff --git a/configure b/configure
index 57c39d10..0c062728 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: configure,v 1.8 2009-05-14 00:40:58 nicm Exp $
+# $Id: configure,v 1.9 2009-05-14 07:49:23 nicm Exp $
 
 UNAME=`uname -s`
 
@@ -80,14 +80,16 @@ EOF
 # ------------------------------------------------------------------------------
     SunOS)
 	cat <<EOF >>$CONFIG_H
+#define HAVE_CRYPT_H
 #define HAVE_POLL
 #define HAVE_STRLCAT
 #define HAVE_STRLCPY
 #define HAVE_VSYSLOG
 EOF
 	cat <<EOF >>$CONFIG_MK
-CPPFLAGS+= -I/usr/local/include/ncurses
-LDFLAGS+= -L/usr/gnu/lib
+CPPFLAGS+= -I/usr/local/include/ncurses \
+	-I/opt/csw/include -I/opt/csw/include/ncurses
+LDFLAGS+= -L/usr/gnu/lib -L/opt/csw/lib
 LIBS+= -lsocket -lnsl
 SRCS+= osdep-unknown.c \
 	compat/asprintf.c \