diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a8cd839fd91..6eb54bf5156 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* cpplex.c (cpp_scan_buffer): Output line command even at the stop
+	buffer, provided it is not NULL.
+
 2000-07-18  Alexandre Oliva  <aoliva@redhat.com>
 
 	* c-decl.c (duplicate_decls): Do not call make_var_volatile() in
@@ -5,8 +10,7 @@
 
 2000-07-18  Jakub Jelinek  <jakub@redhat.com>
 
-	* calls.c (store_arg): Return non-zero if sibcall_failure is
-	desired.
+	* calls.c (store_arg): Return non-zero if sibcall_failure is desired.
 	(expand_call): Adjust caller.
 
 2000-07-17  Gabriel Dos Reis  <gdr@codesourcery.com>
diff --git a/gcc/cpplex.c b/gcc/cpplex.c
index a41e4eea6ed..0d5ef46230d 100644
--- a/gcc/cpplex.c
+++ b/gcc/cpplex.c
@@ -454,10 +454,13 @@ cpp_scan_buffer (pfile, print)
       if (token->type == CPP_EOF)
 	{
 	  cpp_pop_buffer (pfile);
+
+	  if (CPP_BUFFER (pfile))
+	    cpp_output_tokens (pfile, print, CPP_BUF_LINE (CPP_BUFFER (pfile)));
+
 	  if (CPP_BUFFER (pfile) == stop)
 	    return;
 
-	  cpp_output_tokens (pfile, print, CPP_BUF_LINE (CPP_BUFFER (pfile)));
 	  prev = 0;
 	  continue;
 	}