diff --git a/ChangeLog b/ChangeLog
index e41c3e7330..2520c44371 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-10-22  Florian Weimer  <fweimer@redhat.com>
+
+	* math/math.h [__cplusplus] (iszero): Wrap C++ bits in extern
+	"C++", to override a potential extern "C" directive around the
+	header file inclusion.
+
 2016-10-21  Joseph Myers  <joseph@codesourcery.com>
 
 	* benchtests/Makefile (CFLAGS-bench-sqrt.c): New variable.
diff --git a/math/math.h b/math/math.h
index 0220d08d8a..7c0c709523 100644
--- a/math/math.h
+++ b/math/math.h
@@ -342,7 +342,7 @@ enum
 #   define iszero(x) (((__typeof (x)) (x)) == 0)
 #  endif
 # else	/* __cplusplus */
-__END_DECLS
+extern "C++" {
 template <class __T> inline bool
 iszero (__T __val)
 {
@@ -352,7 +352,7 @@ iszero (__T __val)
   return __val == 0;
 #  endif
 }
-__BEGIN_DECLS
+} /* extern C++ */
 # endif	/* __cplusplus */
 #endif /* Use IEC_60559_BFP_EXT.  */