diff --git a/clamav-devel/ChangeLog b/clamav-devel/ChangeLog
index 4184a156a..fe5e3c0f8 100644
--- a/clamav-devel/ChangeLog
+++ b/clamav-devel/ChangeLog
@@ -1,3 +1,7 @@
+Fri Feb  2 23:38:12 CET 2007 (tk)
+---------------------------------
+  * configure/make: minor cleanup and fix for bb#260
+
 Thu Feb  1 12:42:56 GMT 2007 (njh)
 ----------------------------------
   * libclamav:	Remove some warnings from icc
diff --git a/clamav-devel/Makefile.in b/clamav-devel/Makefile.in
index 70fa9a072..e00692a64 100644
--- a/clamav-devel/Makefile.in
+++ b/clamav-devel/Makefile.in
@@ -112,7 +112,6 @@ GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
@@ -182,6 +181,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+THREAD_LIBS = @THREAD_LIBS@
 TH_SAFE = @TH_SAFE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
diff --git a/clamav-devel/clamav-milter/Makefile.am b/clamav-devel/clamav-milter/Makefile.am
index 04625b72f..d2ff83d7c 100644
--- a/clamav-devel/clamav-milter/Makefile.am
+++ b/clamav-devel/clamav-milter/Makefile.am
@@ -42,6 +42,6 @@ man_MANS = $(top_srcdir)/docs/man/clamav-milter.8
 endif
 endif
 
-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
 INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared
 EXTRA_DIST = clamav-milter.c INSTALL
diff --git a/clamav-devel/clamav-milter/Makefile.in b/clamav-devel/clamav-milter/Makefile.in
index 9a2e8eb02..ca78e9e5c 100644
--- a/clamav-devel/clamav-milter/Makefile.in
+++ b/clamav-devel/clamav-milter/Makefile.in
@@ -107,7 +107,6 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
@@ -157,7 +156,7 @@ LDFLAGS = @LDFLAGS@
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
 LIBOBJS = @LIBOBJS@
-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -177,6 +176,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+THREAD_LIBS = @THREAD_LIBS@
 TH_SAFE = @TH_SAFE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
diff --git a/clamav-devel/clamconf/Makefile.am b/clamav-devel/clamconf/Makefile.am
index ec80a5be1..b2d0ce0f0 100644
--- a/clamav-devel/clamconf/Makefile.am
+++ b/clamav-devel/clamconf/Makefile.am
@@ -30,4 +30,4 @@ clamconf_SOURCES = \
     clamconf.c
 
 INCLUDES = -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
-LIBS = $(top_builddir)/libclamav/libclamav.la
+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
diff --git a/clamav-devel/clamconf/Makefile.in b/clamav-devel/clamconf/Makefile.in
index 36fcc1895..15c8e742f 100644
--- a/clamav-devel/clamconf/Makefile.in
+++ b/clamav-devel/clamconf/Makefile.in
@@ -90,7 +90,6 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
@@ -140,7 +139,7 @@ LDFLAGS = @LDFLAGS@
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
 LIBOBJS = @LIBOBJS@
-LIBS = $(top_builddir)/libclamav/libclamav.la
+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -160,6 +159,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+THREAD_LIBS = @THREAD_LIBS@
 TH_SAFE = @TH_SAFE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
diff --git a/clamav-devel/clamd/Makefile.am b/clamav-devel/clamd/Makefile.am
index d831f0b57..d05d6409f 100644
--- a/clamav-devel/clamd/Makefile.am
+++ b/clamav-devel/clamd/Makefile.am
@@ -62,5 +62,5 @@ clamd_SOURCES = \
 
 endif
 
-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @ADDITIONAL_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
diff --git a/clamav-devel/clamd/Makefile.in b/clamav-devel/clamd/Makefile.in
index fc52663b5..dec174418 100644
--- a/clamav-devel/clamd/Makefile.in
+++ b/clamav-devel/clamd/Makefile.in
@@ -112,7 +112,6 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
@@ -162,7 +161,7 @@ LDFLAGS = @LDFLAGS@
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
 LIBOBJS = @LIBOBJS@
-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @ADDITIONAL_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -182,6 +181,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+THREAD_LIBS = @THREAD_LIBS@
 TH_SAFE = @TH_SAFE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
diff --git a/clamav-devel/clamdscan/Makefile.am b/clamav-devel/clamdscan/Makefile.am
index a5896a057..01531bc44 100644
--- a/clamav-devel/clamdscan/Makefile.am
+++ b/clamav-devel/clamdscan/Makefile.am
@@ -40,6 +40,5 @@ clamdscan_SOURCES = \
 
 endif
 
-DEFS = @DEFS@ -DCL_NOTHREADS
 INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
diff --git a/clamav-devel/clamdscan/Makefile.in b/clamav-devel/clamdscan/Makefile.in
index c75b8bd7b..3710475c8 100644
--- a/clamav-devel/clamdscan/Makefile.in
+++ b/clamav-devel/clamdscan/Makefile.in
@@ -101,7 +101,6 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
@@ -128,7 +127,7 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DBDIR = @DBDIR@
-DEFS = @DEFS@ -DCL_NOTHREADS
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
@@ -151,7 +150,7 @@ LDFLAGS = @LDFLAGS@
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
 LIBOBJS = @LIBOBJS@
-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -171,6 +170,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+THREAD_LIBS = @THREAD_LIBS@
 TH_SAFE = @TH_SAFE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
diff --git a/clamav-devel/clamscan/Makefile.am b/clamav-devel/clamscan/Makefile.am
index 899879cc9..abe176485 100644
--- a/clamav-devel/clamscan/Makefile.am
+++ b/clamav-devel/clamscan/Makefile.am
@@ -42,6 +42,5 @@ clamscan_SOURCES = \
     treewalk.c \
     treewalk.h
 
-DEFS = @DEFS@ -DCL_NOTHREADS
-LIBS = $(top_builddir)/libclamav/libclamav.la @ADDITIONAL_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
diff --git a/clamav-devel/clamscan/Makefile.in b/clamav-devel/clamscan/Makefile.in
index fadf31732..ce04a4315 100644
--- a/clamav-devel/clamscan/Makefile.in
+++ b/clamav-devel/clamscan/Makefile.in
@@ -93,7 +93,6 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
@@ -120,7 +119,7 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DBDIR = @DBDIR@
-DEFS = @DEFS@ -DCL_NOTHREADS
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
@@ -143,7 +142,7 @@ LDFLAGS = @LDFLAGS@
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
 LIBOBJS = @LIBOBJS@
-LIBS = $(top_builddir)/libclamav/libclamav.la @ADDITIONAL_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -163,6 +162,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+THREAD_LIBS = @THREAD_LIBS@
 TH_SAFE = @TH_SAFE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
diff --git a/clamav-devel/configure b/clamav-devel/configure
index f49a883f8..1abbcfc6d 100755
--- a/clamav-devel/configure
+++ b/clamav-devel/configure
@@ -883,7 +883,7 @@ CLAMD_LIBS
 CLAMAV_MILTER_LIBS
 FRESHCLAM_LIBS
 TH_SAFE
-ADDITIONAL_LIBS
+THREAD_LIBS
 BUILD_CLAMD_TRUE
 BUILD_CLAMD_FALSE
 HAVE_MILTER_TRUE
@@ -23023,7 +23023,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
+	THREAD_LIBS="-lpthread"
 	TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -23035,8 +23035,6 @@ cat >>confdefs.h <<\_ACEOF
 #define _REENTRANT 1
 _ACEOF
 
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
 	if test "$want_clamuko" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -23044,7 +23042,6 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 	fi
-	CLAMSCAN_LIBS="$CLAMSCAN_LIBS -lpthread"
     fi
     case `uname -r` in
     1.*|2.0.*)
@@ -23063,7 +23060,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
     if test "$have_pthreads" = "yes"; then
-       LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
+       THREAD_LIBS="-lpthread"
        TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -23075,8 +23072,6 @@ cat >>confdefs.h <<\_ACEOF
 #define _REENTRANT 1
 _ACEOF
 
-       CLAMD_LIBS="$CLAMD_LIBS -lpthread"
-       CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
        if test "$want_clamuko" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -23084,7 +23079,6 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
        fi
-       CLAMSCAN_LIBS="$CLAMSCAN_LIBS -lpthread"
     fi
     ;;
 cygwin*)
@@ -23099,7 +23093,7 @@ _ACEOF
 	fi
     fi
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
+	THREAD_LIBS="-lpthread"
 	TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -23117,9 +23111,9 @@ _ACEOF
 solaris*)
     FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lresolv"
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread -lresolv"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread -lresolv"
+	THREAD_LIBS="-lpthread"
+	CLAMD_LIBS="$CLAMD_LIBS -lresolv"
+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lresolv"
 	TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -23140,9 +23134,7 @@ _ACEOF
     ;;
 freebsd*)
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r"
-	CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
+	THREAD_LIBS="-lpthread -lc_r"
 	TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -23171,9 +23163,7 @@ _ACEOF
     ;;
 dragonfly*)
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
-	CLAMD_LIBS="$CLAMD_LIBS -pthread"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
+	THREAD_LIBS="-pthread"
 	TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -23202,13 +23192,10 @@ _ACEOF
     ;;
 openbsd*)
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
 	if test "$use_cr" = "no"; then
-	    CLAMD_LIBS="$CLAMD_LIBS -pthread"
-	    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
+	    THREAD_LIBS="-pthread"
 	else
-	    CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r"
-	    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
+	    THREAD_LIBS="-pthread -lc_r"
 	fi
 	TH_SAFE="-thread-safe"
 
@@ -23231,9 +23218,7 @@ _ACEOF
     ;;
 bsdi*)
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
-	CLAMD_LIBS="$CLAMD_LIBS -pthread"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
+	THREAD_LIBS="-pthread"
 	TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -23255,9 +23240,7 @@ _ACEOF
     ;;
 netbsd*)
      if test "$have_pthreads" = "yes"; then
- 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
- 	CLAMD_LIBS="-lpthread"
- 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
+	THREAD_LIBS="-lpthread"
 
 cat >>confdefs.h <<\_ACEOF
 #define CL_THREAD_SAFE 1
@@ -23268,7 +23251,6 @@ cat >>confdefs.h <<\_ACEOF
 #define _REENTRANT 1
 _ACEOF
 
-	ADDITIONAL_LIBS="$LIBS -lpthread"
      fi
 
 cat >>confdefs.h <<\_ACEOF
@@ -23322,9 +23304,7 @@ os2*)
     CLAMD_LIBS="$CLAMD_LIBS -lsyslog"
     CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsyslog"
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
+	THREAD_LIBS="-lpthread"
 	TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -23347,9 +23327,7 @@ sco*)
                     ;;
 hpux*)
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
+	THREAD_LIBS="-lpthread"
 	TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -23370,9 +23348,7 @@ _ACEOF
     ;;
 aix*)
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
+	THREAD_LIBS="-lpthread"
 	TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -23412,9 +23388,7 @@ _ACEOF
     ;;
 irix*)
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
+	THREAD_LIBS="-lpthread"
 	TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -23445,7 +23419,7 @@ _ACEOF
 	fi
     fi
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
+	THREAD_LIBS="-lpthread"
 	TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -26674,7 +26648,7 @@ CLAMD_LIBS!$CLAMD_LIBS$ac_delim
 CLAMAV_MILTER_LIBS!$CLAMAV_MILTER_LIBS$ac_delim
 FRESHCLAM_LIBS!$FRESHCLAM_LIBS$ac_delim
 TH_SAFE!$TH_SAFE$ac_delim
-ADDITIONAL_LIBS!$ADDITIONAL_LIBS$ac_delim
+THREAD_LIBS!$THREAD_LIBS$ac_delim
 BUILD_CLAMD_TRUE!$BUILD_CLAMD_TRUE$ac_delim
 BUILD_CLAMD_FALSE!$BUILD_CLAMD_FALSE$ac_delim
 HAVE_MILTER_TRUE!$HAVE_MILTER_TRUE$ac_delim
diff --git a/clamav-devel/configure.in b/clamav-devel/configure.in
index ff8242b23..697726fa2 100644
--- a/clamav-devel/configure.in
+++ b/clamav-devel/configure.in
@@ -391,16 +391,13 @@ case "$target_os" in
 linux*)
     AC_DEFINE(C_LINUX,1,[target is linux])
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
+	THREAD_LIBS="-lpthread"
 	TH_SAFE="-thread-safe"
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
 	AC_DEFINE(_REENTRANT,1,[thread safe])
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
 	if test "$want_clamuko" = "yes"; then
 	    AC_DEFINE(CLAMUKO,1,[enable clamuko])
 	fi
-	CLAMSCAN_LIBS="$CLAMSCAN_LIBS -lpthread"
     fi
     case `uname -r` in
     1.*|2.0.*)
@@ -411,16 +408,13 @@ linux*)
 kfreebsd*-gnu)
     AC_DEFINE(C_KFREEBSD_GNU,1,[target is kfreebsd-gnu])
     if test "$have_pthreads" = "yes"; then
-       LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
+       THREAD_LIBS="-lpthread"
        TH_SAFE="-thread-safe"
        AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
        AC_DEFINE(_REENTRANT,1,[thread safe])
-       CLAMD_LIBS="$CLAMD_LIBS -lpthread"
-       CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
        if test "$want_clamuko" = "yes"; then
            AC_DEFINE(CLAMUKO,1,[enable clamuko])
        fi
-       CLAMSCAN_LIBS="$CLAMSCAN_LIBS -lpthread"
     fi
     ;;
 cygwin*)
@@ -431,7 +425,7 @@ cygwin*)
 	fi
     fi
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
+	THREAD_LIBS="-lpthread"
 	TH_SAFE="-thread-safe"
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
 	AC_DEFINE(_REENTRANT,1,[thread safe])
@@ -441,9 +435,9 @@ cygwin*)
 solaris*)
     FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lresolv"
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread -lresolv"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread -lresolv"
+	THREAD_LIBS="-lpthread"
+	CLAMD_LIBS="$CLAMD_LIBS -lresolv"
+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lresolv"
 	TH_SAFE="-thread-safe"
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
 	AC_DEFINE(_REENTRANT,1,[thread safe])
@@ -452,9 +446,7 @@ solaris*)
     ;;
 freebsd*)
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r"
-	CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
+	THREAD_LIBS="-lpthread -lc_r"
 	TH_SAFE="-thread-safe"
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
 	AC_DEFINE(_REENTRANT,1,[thread safe])
@@ -467,9 +459,7 @@ freebsd*)
     ;;
 dragonfly*)
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
-	CLAMD_LIBS="$CLAMD_LIBS -pthread"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
+	THREAD_LIBS="-pthread"
 	TH_SAFE="-thread-safe"
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
 	AC_DEFINE(_REENTRANT,1,[thread safe])
@@ -482,13 +472,10 @@ dragonfly*)
     ;;
 openbsd*)
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
 	if test "$use_cr" = "no"; then
-	    CLAMD_LIBS="$CLAMD_LIBS -pthread"
-	    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
+	    THREAD_LIBS="-pthread"
 	else
-	    CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r"
-	    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
+	    THREAD_LIBS="-pthread -lc_r"
 	fi
 	TH_SAFE="-thread-safe"
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
@@ -499,9 +486,7 @@ openbsd*)
     ;;
 bsdi*)
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
-	CLAMD_LIBS="$CLAMD_LIBS -pthread"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
+	THREAD_LIBS="-pthread"
 	TH_SAFE="-thread-safe"
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
 	AC_DEFINE(_REENTRANT,1,[thread safe])
@@ -511,12 +496,9 @@ bsdi*)
     ;;
 netbsd*)
      if test "$have_pthreads" = "yes"; then
- 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
- 	CLAMD_LIBS="-lpthread"
- 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
+	THREAD_LIBS="-lpthread"
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
 	AC_DEFINE(_REENTRANT,1,[thread safe])
-	ADDITIONAL_LIBS="$LIBS -lpthread"
      fi
     AC_DEFINE(C_BSD,1,[os is NetBSD])
     use_gethostbyname_r="no"
@@ -544,9 +526,7 @@ os2*)
     CLAMD_LIBS="$CLAMD_LIBS -lsyslog"
     CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsyslog"
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
+	THREAD_LIBS="-lpthread"
 	TH_SAFE="-thread-safe"
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
 	AC_DEFINE(_REENTRANT,1,[thread safe])
@@ -561,9 +541,7 @@ sco*)
     ;;
 hpux*)
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
+	THREAD_LIBS="-lpthread"
 	TH_SAFE="-thread-safe"
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
 	AC_DEFINE(_REENTRANT,1,[thread safe])
@@ -572,9 +550,7 @@ hpux*)
     ;;
 aix*)
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
+	THREAD_LIBS="-lpthread"
 	TH_SAFE="-thread-safe"
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
 	AC_DEFINE(_REENTRANT,1,[thread safe])
@@ -590,9 +566,7 @@ nto-qnx*)
     ;;
 irix*)
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
+	THREAD_LIBS="-lpthread"
 	TH_SAFE="-thread-safe"
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
 	AC_DEFINE(_REENTRANT,1,[thread safe])
@@ -607,7 +581,7 @@ interix*)
 	fi
     fi
     if test "$have_pthreads" = "yes"; then
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
+	THREAD_LIBS="-lpthread"
 	TH_SAFE="-thread-safe"
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
 	AC_DEFINE(_REENTRANT,1,[thread safe])
@@ -622,7 +596,7 @@ AC_SUBST(CLAMD_LIBS)
 AC_SUBST(CLAMAV_MILTER_LIBS)
 AC_SUBST(FRESHCLAM_LIBS)
 AC_SUBST(TH_SAFE)
-AC_SUBST(ADDITIONAL_LIBS)
+AC_SUBST(THREAD_LIBS)
 
 dnl --enable-milter
 if test "$have_milter" = "yes"; then
diff --git a/clamav-devel/database/Makefile.in b/clamav-devel/database/Makefile.in
index becb334aa..528f220c9 100644
--- a/clamav-devel/database/Makefile.in
+++ b/clamav-devel/database/Makefile.in
@@ -70,7 +70,6 @@ SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
@@ -140,6 +139,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+THREAD_LIBS = @THREAD_LIBS@
 TH_SAFE = @TH_SAFE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
diff --git a/clamav-devel/docs/Makefile.in b/clamav-devel/docs/Makefile.in
index 4d53540cc..2afec7249 100644
--- a/clamav-devel/docs/Makefile.in
+++ b/clamav-devel/docs/Makefile.in
@@ -75,7 +75,6 @@ NROFF = nroff
 MANS = $(man_MANS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
@@ -145,6 +144,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+THREAD_LIBS = @THREAD_LIBS@
 TH_SAFE = @TH_SAFE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
diff --git a/clamav-devel/etc/Makefile.in b/clamav-devel/etc/Makefile.in
index a02688dfd..694b7c1a9 100644
--- a/clamav-devel/etc/Makefile.in
+++ b/clamav-devel/etc/Makefile.in
@@ -68,7 +68,6 @@ SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
@@ -138,6 +137,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+THREAD_LIBS = @THREAD_LIBS@
 TH_SAFE = @TH_SAFE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
diff --git a/clamav-devel/freshclam/Makefile.am b/clamav-devel/freshclam/Makefile.am
index 826ad950c..ef524c299 100644
--- a/clamav-devel/freshclam/Makefile.am
+++ b/clamav-devel/freshclam/Makefile.am
@@ -50,4 +50,4 @@ freshclam_SOURCES = \
 
 DEFS = @DEFS@ -DCL_NOTHREADS
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
diff --git a/clamav-devel/freshclam/Makefile.in b/clamav-devel/freshclam/Makefile.in
index a99546d80..1675a11c0 100644
--- a/clamav-devel/freshclam/Makefile.in
+++ b/clamav-devel/freshclam/Makefile.in
@@ -94,7 +94,6 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
@@ -144,7 +143,7 @@ LDFLAGS = @LDFLAGS@
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
 LIBOBJS = @LIBOBJS@
-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -164,6 +163,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+THREAD_LIBS = @THREAD_LIBS@
 TH_SAFE = @TH_SAFE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
diff --git a/clamav-devel/libclamav/Makefile.am b/clamav-devel/libclamav/Makefile.am
index d73093377..7302dd7f8 100644
--- a/clamav-devel/libclamav/Makefile.am
+++ b/clamav-devel/libclamav/Makefile.am
@@ -19,7 +19,7 @@
 
 INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar
 
-libclamav_la_LIBADD = @LIBCLAMAV_LIBS@
+libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@
 
 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
 
diff --git a/clamav-devel/libclamav/Makefile.in b/clamav-devel/libclamav/Makefile.in
index b5c2886d7..bb49e58ec 100644
--- a/clamav-devel/libclamav/Makefile.in
+++ b/clamav-devel/libclamav/Makefile.in
@@ -110,7 +110,6 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
@@ -180,6 +179,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+THREAD_LIBS = @THREAD_LIBS@
 TH_SAFE = @TH_SAFE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
@@ -235,7 +235,7 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar
-libclamav_la_LIBADD = @LIBCLAMAV_LIBS@
+libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@
 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
 include_HEADERS = clamav.h
 libclamav_la_SOURCES = \
diff --git a/clamav-devel/sigtool/Makefile.am b/clamav-devel/sigtool/Makefile.am
index 1dbccc08d..55cdaabbe 100644
--- a/clamav-devel/sigtool/Makefile.am
+++ b/clamav-devel/sigtool/Makefile.am
@@ -41,4 +41,4 @@ sigtool_SOURCES = \
 
 DEFS = @DEFS@ -DCL_NOTHREADS
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
diff --git a/clamav-devel/sigtool/Makefile.in b/clamav-devel/sigtool/Makefile.in
index e3153a52e..63e09eca1 100644
--- a/clamav-devel/sigtool/Makefile.in
+++ b/clamav-devel/sigtool/Makefile.in
@@ -92,7 +92,6 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
@@ -144,7 +143,7 @@ LDFLAGS = @LDFLAGS@
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
 LIBOBJS = @LIBOBJS@
-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -164,6 +163,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+THREAD_LIBS = @THREAD_LIBS@
 TH_SAFE = @TH_SAFE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@