diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0b3ce92c0e4..a4dfd3afe51 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-30  Richard Biener  <rguenther@suse.de>
+
+	* builtins.c: Add comment that no new simplifications shouldd
+	be added here.
+
 2015-09-30  Marek Polacek  <polacek@redhat.com>
 
 	PR tree-optimization/67690
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 15928109247..2ff1a8c82bb 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -17,6 +17,10 @@ You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
+/* Legacy warning!  Please add no further builtin simplifications here
+   (apart from pure constant folding) - builtin simplifications should go
+   to match.pd or gimple-fold.c instead.  */
+
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"