diff --git a/ChangeLog b/ChangeLog
index a49627c1..4c2f61c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-03  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* configure.in: Look for nanosleep in -lrt and -lposix4, which is
+	where Solaris has them.
+
 2003-11-03  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* configure.in: Check for nanosleep.
diff --git a/configure.in b/configure.in
index eed67f1e..d49233bd 100644
--- a/configure.in
+++ b/configure.in
@@ -194,7 +194,10 @@ AC_FUNC_MMAP
 AC_CHECK_FUNCS(strdup strstr strcasecmp strncasecmp strpbrk memmove)
 AC_CHECK_FUNCS(gettimeofday mktime strptime strerror snprintf vsnprintf)
 AC_CHECK_FUNCS(select sigblock sigsetjmp signal symlink access isatty)
-AC_CHECK_FUNCS(uname gethostname nanosleep usleep)
+AC_CHECK_FUNCS(uname gethostname usleep)
+AC_CHECK_FUNC(nanosleep,,[
+  AC_CHECK_LIB(rt,nanosleep,,[
+    AC_CHECK_LIB(posix4,nanosleep)])])
 
 dnl
 dnl Check if we need to compile in getopt.c.