diff --git a/NEWS b/NEWS
index f5098551110..e3ea10407fe 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,8 @@ PHP                                                                        NEWS
 - Fixed memory leak in extension loading when an error occurs on Windows.
   (Pierre)
 
+- Fixed bug #50345 (nanosleep not detected properly on some solaris versions).
+  (Jani)
 - Fixed bug #50340 (php.ini parser does not allow spaces in ini keys). (Jani)
 - Fixed bug #50285 (xmlrpc does not preserve keys in encoded indexed arrays).
   (Felipe)
diff --git a/configure.in b/configure.in
index 788a3f0f9d7..5f656cc2be2 100644
--- a/configure.in
+++ b/configure.in
@@ -387,9 +387,6 @@ dnl Check for inet_aton
 dnl in -lc, -lbind and -lresolv
 PHP_CHECK_FUNC(inet_aton, resolv, bind)
 
-dnl Some systems (like OpenSolaris) do not have nanosleep in libc
-PHP_CHECK_FUNC(nanosleep, rt)
-
 dnl Then headers.
 dnl -------------------------------------------------------------------------
 
@@ -614,6 +611,9 @@ vasprintf \
 asprintf \
 )
 
+dnl Some systems (like OpenSolaris) do not have nanosleep in libc
+AC_CACHE_CHECK([for nanosleep], ac_cv_func_nanosleep, [PHP_CHECK_FUNC_LIB(nanosleep, rt)])
+
 dnl Check for getaddrinfo, should be a better way, but...
 dnl Also check for working getaddrinfo
 AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo,