diff --git a/ChangeLog b/ChangeLog
index 765c6d2bfe2b11e138fb6dc85eef301a4efa8d9c..54644cd7de2eb566a9c0cabb7130ea8992025e5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Aug 22 10:30:42 CEST 2008 Jim Meyering <meyering@redhat.com>
+
+	configure.in: link with -lpthread when necessary
+	* configure.in: Explicitly add -lpthread to $LIBS.
+	With an empty "ACTION_IF_FOUND", AC_CHECK_LIB would have done
+	that for us automatically, but when there is an explicit third
+	argument, those commands are run instead of the default.
+	Reported by Jun Koi <junkoi2004@gmail.com>.
+
 Thu Aug 21 21:29:28 CEST 2008 Jim Meyering <meyering@redhat.com>
 
 	autobuild.sh: Fix minor shell-quoting bugs.
diff --git a/configure.in b/configure.in
index 3789abd8ec3adf102f4ee3ed1bbcf609dd338018..9479f1c91268e61c9d77211bc5391803a597b615 100644
--- a/configure.in
+++ b/configure.in
@@ -90,6 +90,7 @@ AC_CHECK_HEADER([pthread.h],
 	[AC_CHECK_LIB([pthread],[pthread_join],[
 		AC_DEFINE([HAVE_LIBPTHREAD],[],[Define if pthread (-lpthread)])
 		AC_DEFINE([HAVE_PTHREAD_H],[],[Define if <pthread.h>])
+		LIBS="-lpthread $LIBS"
 	])])
 
 dnl Miscellaneous external programs.