diff --git a/ChangeLog b/ChangeLog
index d68277465..e473ac6a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-05-03  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	Make Xephyr build on Solaris:
+	
+	* hw/kdrive/src/kinput.c: 
+	Add #include <sys/file.h> on Solaris for FNONBLOCK/FASYNC definitions
+
+	* hw/kdriver/linux/Makefile.am
+	Move agp.c & agp.h to KDRIVE_HW_SOURCES since they're not needed
+	for Xephyr-only builds
+
+	* configure.ac:
+	Add -lrt to XEPHYR_LIBS if needed to get nanosleep().
+
 2006-05-03  Adam Jackson  <ajax@freedesktop.org>
 
 	* hw/xfree86/common/xf86Configure.c:
diff --git a/configure.ac b/configure.ac
index e43354cd7..cb13e40f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1463,6 +1463,10 @@ AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
 #AM_CONDITIONAL(KDRIVEVESA, false)
 #AM_CONDITIONAL(KDRIVEFBDEV, false)
 
+# Xephyr needs nanosleep() which is in librt on Solaris
+AC_CHECK_FUNC([nanosleep], [],
+	AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt"))
+
 AM_CONDITIONAL(XEPHYR, [test x"$xephyr" = xyes])
 XEPHYR_LIBS="$XEPHYR_LIBS $XSERVER_LIBS"
 AC_SUBST([XEPHYR_LIBS])
diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am
index ddf1d4e4e..29959df00 100644
--- a/hw/kdrive/linux/Makefile.am
+++ b/hw/kdrive/linux/Makefile.am
@@ -16,14 +16,14 @@ endif
 
 if KDRIVE_HW
 KDRIVE_HW_SOURCES =	\
+	agp.c		\
+	agp.h		\
 	evdev.c		\
 	keyboard.c	\
 	linux.c
 endif
 
 liblinux_a_SOURCES = 	\
-	agp.c		\
-	agp.h		\
 	bus.c		\
 	klinux.h	\
 	mouse.c		\
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 7f1c07f9a..1c77dd133 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -37,6 +37,9 @@
 #include "kkeymap.h"
 #include <signal.h>
 #include <stdio.h>
+#ifdef sun
+#include <sys/file.h> /* needed for FNONBLOCK & FASYNC */
+#endif
 
 #ifdef XKB
 #include <X11/extensions/XKBsrv.h>