diff --git a/cf/pthreads.m4 b/cf/pthreads.m4
index 91f2e69e3..cdcab3a2c 100644
--- a/cf/pthreads.m4
+++ b/cf/pthreads.m4
@@ -12,12 +12,12 @@ case "$host" in
 *-*-solaris2*)
 	native_pthread_support=yes
 	if test "$GCC" = yes; then
-		PTHREAD_CFLAGS=-pthreads
-		PTHREAD_LIBADD=-pthreads
+		PTHREAD_CFLAGS="-D_REENTRANT -D_TS_ERRNO"
+		PTHREAD_LIBADD=-lpthread
 	else
-		PTHREAD_CFLAGS=-mt
+		PTHREAD_CFLAGS="-mt -D_REENTRANT -D_TS_ERRNO"
 		PTHREAD_LDADD=-mt
-		PTHREAD_LIBADD=-mt
+		PTHREAD_LIBADD="-mt -lpthread"
 	fi
 	;;
 *-*-netbsd[[12]]*)
@@ -90,6 +90,10 @@ else
   PTHREAD_LIBADD=""
 fi
 
+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+LDADD="$LDADD $PTHREAD_LDADD"
+LIBADD="$LIBADD $PTHREAD_LIBADD"
+
 AC_SUBST(PTHREAD_CFLAGS)
 AC_SUBST(PTHREAD_LDADD)
 AC_SUBST(PTHREAD_LIBADD)