diff --git a/libquadmath/ChangeLog b/libquadmath/ChangeLog
index 15c0739319d3..f04c70180b5d 100644
--- a/libquadmath/ChangeLog
+++ b/libquadmath/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-06  Shakthi Kannan  <shakthimaan@gmail.com>
+
+	PR libquadmath/55473
+	* quadmath.h: Add 'extern "C"' block for C++ use.
+
 2013-02-19  Jakub Jelinek  <jakub@redhat.com>
 
 	PR libquadmath/56379
diff --git a/libquadmath/quadmath.h b/libquadmath/quadmath.h
index 863fe440b230..aa9ef51b3919 100644
--- a/libquadmath/quadmath.h
+++ b/libquadmath/quadmath.h
@@ -23,6 +23,10 @@ Boston, MA 02110-1301, USA.  */
 
 #include <stdlib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Define the complex type corresponding to __float128
    ("_Complex __float128" is not allowed) */
 typedef _Complex float __attribute__((mode(TC))) __complex128;
@@ -189,4 +193,8 @@ __quadmath_nth (conjq (__complex128 __z))
   return __extension__ ~__z;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif