diff --git a/configure.in b/configure.in
index 3c9341beec3efe0cc47198cb8b56e9e28c810450..dfd26037be68f5309533f126a7e4e70c460a1c37 100644
--- a/configure.in
+++ b/configure.in
@@ -30,6 +30,11 @@ if test x$enable_threads = x; then
      AC_MSG_NOTICE([You are running OpenBSD or NetBSD; I am assuming that
 getaddrinfo is not threadsafe here, so I will disable threads.])
      enable_threads="no";;
+    *-*-solaris* )
+     # Don't try multithreading on solaris -- cpuworkers seem to lock.
+     AC_MSG_NOTICE([You are running Solaris; Sometimes threading makes
+cpu workers lock up here, so I will disable threads.])
+     enable_threads="no";;
     *)
      enable_threads="yes";;
    esac