diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 80948b1ce44..355cf996912 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-11  Jason Merrill  <jason@redhat.com>
+
+	PR c++/39131
+	* rtti.c (emit_support_tinfos): Add DFP types.
+
 2009-11-11  Jason Merrill  <jason@redhat.com>
 
 	* call.c (build_op_delete_call): Downgrade error about
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index 3fb6d11c0ce..e96abcb0c0d 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -1448,6 +1448,7 @@ emit_support_tinfos (void)
     &long_integer_type_node, &long_unsigned_type_node,
     &long_long_integer_type_node, &long_long_unsigned_type_node,
     &float_type_node, &double_type_node, &long_double_type_node,
+    &dfloat32_type_node, &dfloat64_type_node, &dfloat128_type_node,
     0
   };
   int ix;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 95fa34204c9..94f935d80d9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-11  Jason Merrill  <jason@redhat.com>
+
+	PR c++/39131
+	* g++.dg/dfp/typeid1.C: New.
+
 2009-11-11  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/41978
diff --git a/gcc/testsuite/g++.dg/dfp/typeid1.C b/gcc/testsuite/g++.dg/dfp/typeid1.C
new file mode 100644
index 00000000000..cdc33a774fa
--- /dev/null
+++ b/gcc/testsuite/g++.dg/dfp/typeid1.C
@@ -0,0 +1,8 @@
+// PR c++/39131
+// { dg-do link }
+
+#include <typeinfo>
+
+const std::type_info &r = typeid(0.dd);
+
+int main() { }
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b34122c4de5..c075117a55d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-11  Jason Merrill  <jason@redhat.com>
+
+	PR c++/39131
+	* config/abi/pre/gnu.ver: Add DFP types.
+	* testsuite/util/testsuite_abi.cc (check_version): Add CXXABI_1.3.4.
+
 2009-11-11  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/bits/basic_string.h (to_string(int), to_string(unsigned),
diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index 2337a5a3fbf..b0001ca9a62 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -1198,3 +1198,15 @@ CXXABI_1.3.3 {
     _ZSt17rethrow_exceptionNSt15__exception_ptr13exception_ptrE;
 
 } CXXABI_1.3.2;
+
+CXXABI_1.3.4 {
+
+    # typeinfo for decimal floating point types
+    _ZTID[fde];
+    _ZTIPD[fde];
+    _ZTIPKD[fde];
+    _ZTID[fde];
+    _ZTIPD[fde];
+    _ZTIPKD[fde];
+
+} CXXABI_1.3.3;
diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc
index 562568aebcd..2c9f93055fa 100644
--- a/libstdc++-v3/testsuite/util/testsuite_abi.cc
+++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc
@@ -193,6 +193,7 @@ check_version(symbol& test, bool added)
       known_versions.push_back("CXXABI_1.3.1");
       known_versions.push_back("CXXABI_1.3.2");
       known_versions.push_back("CXXABI_1.3.3");
+      known_versions.push_back("CXXABI_1.3.4");
       known_versions.push_back("CXXABI_LDBL_1.3");
     }
   compat_list::iterator begin = known_versions.begin();