diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 40d48794e21e..4b3ad1a8b2a2 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-01  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR libstdc++/58952
+	* include/c_global/cstdio: Undef getchar.
+
 2013-11-01  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	N3421 C++1y Transparent functors
diff --git a/libstdc++-v3/include/c_global/cstdio b/libstdc++-v3/include/c_global/cstdio
index 699a07667829..b56607377769 100644
--- a/libstdc++-v3/include/c_global/cstdio
+++ b/libstdc++-v3/include/c_global/cstdio
@@ -69,6 +69,7 @@ extern "C" char* gets (char* __s) __attribute__((deprecated));
 #undef ftell
 #undef fwrite
 #undef getc
+#undef getchar
 #if __cplusplus <= 201103L
 # undef gets
 #endif