diff --git a/configure.in b/configure.in
index ed145c9879..64be597f10 100644
--- a/configure.in
+++ b/configure.in
@@ -13,7 +13,7 @@ dnl PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 dnl ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 dnl SOFTWARE.
 
-AC_REVISION($Revision: 1.95 $)
+AC_REVISION($Revision: 1.96 $)
 
 AC_PREREQ(2.13)
 
@@ -187,6 +187,15 @@ AC_CHECK_LIB(c, sigwait,
 				       AC_DEFINE(HAVE_SIGWAIT),))
 )
 
+dnl
+dnl Additional OS-specific searching for sigwait.
+dnl
+case "$host" in
+	*-freebsd*)
+		AC_CHECK_LIB(c_r, sigwait, AC_DEFINE(HAVE_SIGWAIT),)
+		;;
+esac
+
 dnl
 dnl Make sure we get the right sigwait() semantics...
 dnl