diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9a6c0b745ed..b53f80adb0f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-06  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+        * cppmacro.c (cpp_get_token): Avoid pasting after a builtin.
+
 2001-02-06  Mark Mitchell  <mark@codesourcery.com>
 
 	* config/rs6000/rs6000.h (ASM_OUTPUT_SYMBOL_REF): Define.
diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index 8e051a9c5b0..3b9f64c2c67 100644
--- a/gcc/cppmacro.c
+++ b/gcc/cppmacro.c
@@ -965,6 +965,7 @@ cpp_get_token (pfile, token)
 	  if (node->flags & NODE_BUILTIN)
 	    {
 	      builtin_macro (pfile, token);
+	      pfile->buffer->saved_flags = AVOID_LPASTE;
 	      break;
 	    }