--- configure.orig	2008-10-15 07:41:31.000000000 -0300
+++ configure	2008-10-15 08:55:58.000000000 -0300
@@ -17909,7 +17909,7 @@
     ;;
 freebsd*)
     if test "$have_pthreads" = "yes"; then
-	THREAD_LIBS="-lthr"
+	THREAD_LIBS="%%PTHREAD_LIBS%%"
 	TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -18269,7 +18269,7 @@
 if test "$have_milter" = "yes"; then
 
         save_LIBS="$LIBS"
-    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
+    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $THREAD_LIBS"
     if test -d /usr/lib/libmilter ; then
 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
     fi
@@ -18806,19 +18806,25 @@
     sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
 
 
+if echo "$sendmailver_a" | egrep -q '^[0-9]+$'; then
 cat >>confdefs.h <<_ACEOF
 #define SENDMAIL_VERSION_A $sendmailver_a
 _ACEOF
+fi
 
 
+if echo "$sendmailver_b" | egrep -q '^[0-9]+$'; then
 cat >>confdefs.h <<_ACEOF
 #define SENDMAIL_VERSION_B $sendmailver_b
 _ACEOF
+fi
 
 
+if echo "$sendmailver_c" | egrep -q '^[0-9]+$'; then
 cat >>confdefs.h <<_ACEOF
 #define SENDMAIL_VERSION_C $sendmailver_c
 _ACEOF
+fi
 
   fi
   if test "x$ac_cv_have_lresolv_r" != "xyes"; then