diff --git a/configure.ac b/configure.ac
index 28c6ef0..91177e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,7 +209,7 @@ elif test "$X_CFLAGS" != "-DX_DISPLAY_MISSING"; then
 		if test "x$with_xrandr" != "xno"; then
 			AC_CHECK_LIB(Xrandr, XRRSelectInput,
 				X_PRELIBS="$X_PRELIBS -lXrandr"
-				[AC_DEFINE(HAVE_LIBXRANDR)], ,
+				[AC_DEFINE(HAVE_LIBXRANDR) HAVE_LIBXRANDR="true"], ,
 				$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
 		fi
 
@@ -233,6 +233,12 @@ elif test "$X_CFLAGS" != "-DX_DISPLAY_MISSING"; then
 			"SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS -R/usr/sfw/lib" ;;
 			esac
 		fi
+		if test ! -z "$HAVE_LIBXRANDR"; then
+			# also need /usr/X11/include for Solaris 10 10/08 and later
+			case `(uname -sr) 2>/dev/null` in
+			"SunOS 5"*) CPPFLAGS="$CPPFLAGS -I/usr/X11/include" ;;
+			esac
+		fi
 
 		X_LIBS="$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS"
 	fi
diff --git a/prepare_x11vnc_dist.sh b/prepare_x11vnc_dist.sh
index 1adf54c..647aa9f 100644
--- a/prepare_x11vnc_dist.sh
+++ b/prepare_x11vnc_dist.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION="0.9.6"
+VERSION="0.9.7"
 
 cd "$(dirname "$0")"