diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0abf2434ef3..411ed86e662 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-08  Zack Weinberg  <zack@codesourcery.com>
+
+	* Makefile.in (LIBCPP_OBJS): Take out version.o.
+	* cpphash.h (cpp_reader): Take out print_version member.
+	* cppinit.c: (cpp_handle_option): Don't do anything with
+	-version.  Just set help_only for --version, --target-help.
+	Just set verbose option for -v.
+	(cpp_post_options): Don't print a version string.
+
 2002-06-08  Marek Michalkiewicz  <marekm@amelek.gda.pl>
 
 	* config/avr/avr.c (TARGET_SECTION_TYPE_FLAGS): New.
@@ -13,7 +22,7 @@
 2002-06-08  Jason Thorpe  <thorpej@wasabisystems.com>
 
 	* config/sh/sh.h (SUBTARGET_EXTRA_SPECS): Define empty
-	if not already defined. 
+	if not already defined.
 	(EXTRA_SPECS): Add SUBTARGET_EXTRA_SPECS.
 
 2002-06-08  Marek Michalkiewicz  <marekm@amelek.gda.pl>
@@ -39,8 +48,9 @@
 	(LINK_SPEC, NETBSD_ENTRY_POINT): Define.
 	(SUBTARGET_EXTRA_SPECS): Add netbsd_link_spec and netbsd_entry_point.
 
-2002-06-08  Marc Espie  <espie@openbsd.org>                                   
-	* lists.c (free_list):  Fix typo in comment.                            
+2002-06-08  Marc Espie  <espie@openbsd.org>
+
+	* lists.c (free_list):  Fix typo in comment.
 
 2002-06-08  Andreas Jaeger  <aj@suse.de>
 
@@ -278,9 +288,9 @@ Thu Jun  6 07:17:43 2002  Nicola Pero  <n.pero@mi.flashnet.it>
 
 2002-06-05  Jeffrey Law  <law@redhat.com>
 
-        * pa.h (EXTRA_CONSTRAINT, T case): Further refine so that it
-        rejects (mem (lo_sum (reg) (unspec))), but will allow
-        (mem (lo_sum (reg) (symbol_ref)) for PA2.0.
+	* pa.h (EXTRA_CONSTRAINT, T case): Further refine so that it
+	rejects (mem (lo_sum (reg) (unspec))), but will allow
+	(mem (lo_sum (reg) (symbol_ref)) for PA2.0.
 
 2002-06-05  Neil Booth  <neil@daikokuya.demon.co.uk>
 
@@ -428,8 +438,8 @@ config/i386:
 	* config/ia64/ia64.c (gen_thread_pointer): Fix variable name.
 
 2002-06-04  Jeff Law <law@redhat.com.
-            David Edelsohn <edelsohn@gnu.org>
-            Michael Matz <matz@kde.org>
+	    David Edelsohn <edelsohn@gnu.org>
+	    Michael Matz <matz@kde.org>
 
 	* sched-int.h (struct deps): New field libcall_block_tail_insn.
 	* sched_deps.c (init_deps): Initialize libcall_block_tail_insn.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6619450cb4a..24b016ff1f4 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2072,7 +2072,7 @@ PREPROCESSOR_DEFINES = \
 
 LIBCPP_OBJS =	cpplib.o cpplex.o cppmacro.o cppexp.o cppfiles.o cpptrad.o \
 		cpphash.o cpperror.o cppinit.o cppdefault.o cppmain.o \
-		hashtable.o line-map.o mkdeps.o prefix.o version.o mbchar.o
+		hashtable.o line-map.o mkdeps.o prefix.o mbchar.o
 
 LIBCPP_DEPS =	$(CPPLIB_H) cpphash.h line-map.h hashtable.h intl.h \
 		$(OBSTACK_H) $(SYSTEM_H)
diff --git a/gcc/cpphash.h b/gcc/cpphash.h
index 38ba244769a..9a4915daf72 100644
--- a/gcc/cpphash.h
+++ b/gcc/cpphash.h
@@ -386,10 +386,6 @@ struct cpp_reader
      preprocessor.  */
   struct spec_nodes spec_nodes;
 
-  /* Whether to print our version number.  Done this way so
-     we don't get it twice for -v -version.  */
-  unsigned char print_version;
-
   /* Whether cpplib owns the hashtable.  */
   unsigned char our_hashtable;
 
diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index 1bb323f9988..466c7c582dd 100644
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -1211,7 +1211,6 @@ new_pending_directive (pend, text, handler)
   DEF_OPT("traditional-cpp",	      0,      OPT_traditional_cpp)            \
   DEF_OPT("trigraphs",                0,      OPT_trigraphs)                  \
   DEF_OPT("v",                        0,      OPT_v)                          \
-  DEF_OPT("version",                  0,      OPT_version)                    \
   DEF_OPT("w",                        0,      OPT_w)
 
 #define DEF_OPT(text, msg, code) code,
@@ -1389,26 +1388,15 @@ cpp_handle_option (pfile, argc, argv)
 	case OPT_h:
 	case OPT__help:
 	  print_help ();
-	  CPP_OPTION (pfile, help_only) = 1;
-	  break;
+	  /* fall through */
 	case OPT_target__help:
-	  /* Print if any target specific options. cpplib has none, but
-	     make sure help_only gets set.  */
-	  CPP_OPTION (pfile, help_only) = 1;
-	  break;
-
-	  /* --version inhibits compilation, -version doesn't. -v means
-	     verbose and -version.  Historical reasons, don't ask.  */
 	case OPT__version:
+	  /* Nothing to do for these cases, but we need to be sure
+	     help_only is set.  */
 	  CPP_OPTION (pfile, help_only) = 1;
-	  pfile->print_version = 1;
 	  break;
 	case OPT_v:
 	  CPP_OPTION (pfile, verbose) = 1;
-	  pfile->print_version = 1;
-	  break;
-	case OPT_version:
-	  pfile->print_version = 1;
 	  break;
 
 	case OPT_C:
@@ -1771,15 +1759,6 @@ void
 cpp_post_options (pfile)
      cpp_reader *pfile;
 {
-  if (pfile->print_version)
-    {
-      fprintf (stderr, _("GNU CPP version %s (cpplib)"), version_string);
-#ifdef TARGET_VERSION
-      TARGET_VERSION;
-#endif
-      fputc ('\n', stderr);
-    }
-
   /* Canonicalize in_fname and out_fname.  We guarantee they are not
      NULL, and that the empty string represents stdin / stdout.  */
   if (CPP_OPTION (pfile, in_fname) == NULL