diff --git a/configure b/configure
index 0383078b2..f10b94cdb 100755
--- a/configure
+++ b/configure
@@ -45,6 +45,37 @@ EOF
   rm -f testconf.c testconf
 }
 
+lm_test()
+{
+  cat > testconf.c << EOF
+  int main()
+  {
+    sqrt( 42 );
+  }
+EOF
+  if ! $CC -o testconf testconf.c > /dev/null 2>&1
+  then
+    if $CC -o testconf testconf.c -lm > /dev/null 2>&1
+    then
+      LINKLIBS="$LINKLIBS -lm"
+    fi
+  fi
+}
+
+lrintf_test()
+{
+  cat > testconf.c << EOF
+  int main()
+  {
+    return ( lrintf( 3.14 ) != 3 );
+  }
+EOF
+  if ( $CC -o testconf testconf.c $LINKLIBS && ./testconf ) > /dev/null 2>&1
+  then
+    DEFINES="$DEFINES HAVE_LRINTF"
+  fi
+}
+
 gettext_test()
 {
   cat > testconf.c <<EOF
@@ -222,7 +253,7 @@ case $SYSTEM in
 
   FreeBSD)
     DEFINES="$DEFINES SYS_FREEBSD"
-    LINKLIBS="$LINKLIBS -pthread -lm"
+    LINKLIBS="$LINKLIBS -pthread"
 
     RELEASE=`uname -r`
     case $RELEASE in
@@ -234,17 +265,17 @@ case $SYSTEM in
 
   NetBSD)
     DEFINES="$DEFINES SYS_NETBSD"
-    LINKLIBS="$LINKLIBS -lpthread -lm"
+    LINKLIBS="$LINKLIBS -lpthread"
     ;;
 
   OpenBSD)
     DEFINES="$DEFINES SYS_OPENBSD"
-    LINKLIBS="$LINKLIBS -lpthread -lm"
+    LINKLIBS="$LINKLIBS -lpthread"
     ;;
 
   Linux)
     DEFINES="$DEFINES SYS_LINUX"
-    LINKLIBS="$LINKLIBS -lpthread -lm"
+    LINKLIBS="$LINKLIBS -lpthread"
     ;;
 
   *)
@@ -285,6 +316,12 @@ else
     gtk_test
 fi
 
+#
+# Math functions
+#
+lm_test
+lrintf_test
+
 #
 # Generate config.jam
 #
diff --git a/libtransmission/choking.c b/libtransmission/choking.c
index f027dc35e..6d03d7e00 100644
--- a/libtransmission/choking.c
+++ b/libtransmission/choking.c
@@ -23,8 +23,8 @@
 #include <math.h>
 #include "transmission.h"
 
-#if defined(SYS_BEOS) || defined(SYS_FREEBSD_4)
-#define lrintf(a) ((int)(0.5+(a)))
+#ifndef HAVE_LRINTF
+#  define lrintf(a) ((int)(0.5+(a)))
 #endif
 
 /* We may try to allocate and free tables of size 0. Quick and dirty