diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e103b8851f4..d15f1d7c571 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-22  Benjamin Kosnik  <bkoz@redhat.com>
+
+	PR libstdc++/38384
+	* acinclude.m4 (GLIBCXX_ENABLE_SYMVERS): Disable symbol versioning
+	on HPUX.
+	* configure: Regenerate.
+
 2009-01-22  Dodji Seketeli  <dodji@redhat.com>
 
 	* include/ext/bitmap_allocator.h: Reverting changes related to PR
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 11f58f66bf6..22e6bc49c5a 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -2728,7 +2728,7 @@ if test x$enable_symvers = xyes ; then
   else
     if test $with_gnu_ld = yes ; then
       case ${target_os} in
-        cygwin* | pe | mingw32*)
+        cygwin* | pe | mingw32* | hpux*)
           enable_symvers=no ;;
         *)
           enable_symvers=gnu ;;
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 81a81e7308e..d11accaf082 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -116669,7 +116669,7 @@ if test x$enable_symvers = xyes ; then
   else
     if test $with_gnu_ld = yes ; then
       case ${target_os} in
-        cygwin* | pe | mingw32*)
+        cygwin* | pe | mingw32* | hpux*)
           enable_symvers=no ;;
         *)
           enable_symvers=gnu ;;