diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 45306aaa3c2..e589f505a82 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -198,6 +198,11 @@ Thu Dec 24 10:39:57 1998  Stan Cox  <scox@cygnus.com>
 
 	* gcc.c (execute): Enable -pipe with win32.
 
+Wed Dec 23 17:30:18 1998  Zack Weinberg  <zack@rabi.phys.columbia.edu>
+
+	* cpplib.c (do_undef): EOF immediately after '#undef FOO' is not an
+	error.
+
 Wed Dec 23 10:27:44 1998  Nick Clifton  <nickc@cygnus.com>
 
 	* config/arm/t-arm-elf: Add multiplib option for leading
diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index 932f222d8bb..891b31278d3 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -3309,7 +3309,7 @@ do_undef (pfile, keyword)
   name[limit - buf] = '\0';
 
   token = get_directive_token (pfile);
-  if (token != CPP_VSPACE)
+  if (token != CPP_VSPACE && token != CPP_POP)
   {
       cpp_pedwarn (pfile, "junk on line after #undef");
       skip_rest_of_line (pfile);