diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 40a36c0df5a..e3484bd5a4e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-20  Oleg Endo <oleg.endo@t-online.de>
+	    Jason Merrill  <jason@redhat.com>
+
+	* system.h: Include <cstdlib> as well as <stdlib.h>.
+
 2013-06-20  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR target/57655
diff --git a/gcc/system.h b/gcc/system.h
index 41cd565538a..f10ba4a0e81 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -226,6 +226,14 @@ extern int errno;
 # include <stdlib.h>
 #endif
 
+/* When compiling C++ we need to include <cstdlib> as well as <stdlib.h> so
+   that it is processed before we poison "malloc"; otherwise, if a source
+   file uses a standard library header that includes <cstdlib>, we will get
+   an error about 'using std::malloc'.  */
+#ifdef __cplusplus
+#include <cstdlib>
+#endif
+
 /* Undef vec_free from AIX stdlib.h header which conflicts with vec.h.  */
 #undef vec_free