diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 24d96d9e4..2de8fcba4 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-25  Vladimir Prus  <vladimir@codesourcery.com>
+
+	* libc/include/math.h: (exception): Add a comment
+	telling fixincludes that we handle C vs. C++ issue.
+
 2006-10-11  Yang Tse  <yangsita@gmail.com>
 
 	* libc/include/machine/setjmp.h: Use __extension__ keyword for gcc's
diff --git a/newlib/libc/include/math.h b/newlib/libc/include/math.h
index 2e1533ad8..11b1a1845 100644
--- a/newlib/libc/include/math.h
+++ b/newlib/libc/include/math.h
@@ -336,7 +336,8 @@ extern int *__signgam _PARAMS((void));
 #define __signgam_r(ptr) _REENT_SIGNGAM(ptr)
 
 /* The exception structure passed to the matherr routine.  */
-
+/* We have a problem when using C++ since `exception' is a reserved
+   name in C++.  */
 #ifdef __cplusplus
 struct __exception 
 #else