diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c235d08ef500..ba6a78534f82 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-10  Per Bothner  <per@bothner.com>
+
+	* c-opts.c (c_common_post_options):   Don't emit working directory
+	in cpp output if -P was specified.
+
 2004-02-10  Paolo Bonzini  <bonzini@gnu.org>
 
 	PR c/14092
diff --git a/gcc/c-opts.c b/gcc/c-opts.c
index 3f773be18d99..37d2ac4639dd 100644
--- a/gcc/c-opts.c
+++ b/gcc/c-opts.c
@@ -1162,7 +1162,8 @@ c_common_post_options (const char **pfilename)
   if (this_input_filename == NULL)
     return true;
 
-  if (flag_preprocess_only && flag_working_directory)
+  if (flag_working_directory
+      && flag_preprocess_only && ! flag_no_line_commands)
     pp_dir_change (parse_in, get_src_pwd ());
 
   return flag_preprocess_only;