diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index aa98bfed646fffdfc14b6d893b4befe8fe363dd7..e2cfdaf9f4dca0ea2af23b4a148d4990f8bc34d2 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	PR target/45693
+	* configure.host (osf*): Set os_include_dir to os/generic.
+	Add -lpthread to OPT_LDFLAGS.
+
 2010-11-02  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/std/bitset (_Base_bitset<>_Base_bitset(unsigned long long)):
diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index 30b28dcd9f67711dcddaed34b41e95b525698bf3..73cf2162cbc39b4e8291715667bcfb13dda4c64c 100644
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -261,6 +261,13 @@ case "${host_os}" in
   netbsd*)
     os_include_dir="os/bsd/netbsd"
     ;;
+  osf*)
+    os_include_dir="os/generic"
+    # libstdc++.so relies on emutls on Tru64 UNIX, which only works with the
+    # real functions implemented in libpthread.so, not with the dummies in
+    # libgcc, so always pass -lpthread.
+    OPT_LDFLAGS="${OPT_LDFLAGS} -lpthread"
+    ;;
   qnx6.[12]*)
     os_include_dir="os/qnx/qnx6.1"
     c_model=c