diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7b87f05b3597514243a8e19c1d8c026eb601caa9..216d649046a4f01439a38f8c71ff16cb007a4f08 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+Fri Aug 15 12:49:56 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* version.c: Change the version string to look like:
+	egcs-1.0.0 970814 (gcc2-970802 experimental).
+
+	* gcc.c: Take out experimental snapshot warning message.
+
 Fri Aug 15 13:43:39 1997  Michael Meissner  <meissner@cygnus.com>
 
 	* haifa-sched.c (debug_dependencies): Use GET_NOTE_INSN_NAME to
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 4f6237cde636f5eecf13b3e6b847cea11297692a..c09285b6270860eaf402a476e42848850a312746 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -4308,11 +4308,6 @@ main (argc, argv)
     signal (SIGPIPE, fatal_error);
 #endif
 
-  { /* Warn users they are using developmental software.  */
-    static void snapshot_warning ();
-    snapshot_warning ();
-  }
-
   argbuf_length = 10;
   argbuf = (char **) xmalloc (argbuf_length * sizeof (char *));
 
@@ -5473,58 +5468,3 @@ print_multilib_info ()
       ++p;
     }
 }
-
-/* For snapshots only.
-   Warn the user that this version of gcc is for testing and developing only.
-   If this is unix, we can restrict the warning to once per day.
-   Otherwise always issue it.  */
-
-#define TIMESTAMP_FILE ".gcc-test-time"
-#define ONE_DAY (24*60*60)
-
-static void
-snapshot_warning ()
-{
-  char *home;
-  int print_p = 1;
-
-#ifdef unix
-  home = getenv ("HOME");
-  if (home != NULL)
-    {
-      char *file_name = (char *) alloca (strlen (home) + 1 + sizeof (TIMESTAMP_FILE));
-      struct stat statbuf;
-      time_t now = time (NULL);
-      int s;
-
-      sprintf (file_name, "%s/%s", home, TIMESTAMP_FILE);
-      s = stat (file_name, &statbuf);
-      if (s == 0
-	  && (statbuf.st_mtime + ONE_DAY > now))
-	print_p = 0;
-      else
-	{
-	  FILE *f;
-
-	  if ((f = fopen (file_name, "w")) == NULL)
-	    {
-	      /* Ensure we have write access.  */
-	      chmod (file_name, s == 0 ? (statbuf.st_mode + 0200) : 0644);
-	      f = fopen (file_name, "w");
-	    }
-	  if (f != NULL)
-	    {
-	      fputc ('\n', f);
-	      fclose (f);
-	    }
-	}
-    }
-#endif
-
-  if (print_p)
-    {
-      fprintf (stderr, "*** This is a development snapshot of GCC.\n");
-      fprintf (stderr, "*** It is not reliable release, and the GCC developers\n");
-      fprintf (stderr, "*** warn you not to use it for anything except to test it.\n");
-    }
-}
diff --git a/gcc/version.c b/gcc/version.c
index 483094fb73760f2e11bed65eb0d09e23783f2fc9..b07b16ded5946cbb181bcd0fbdf2926ffc410bb4 100644
--- a/gcc/version.c
+++ b/gcc/version.c
@@ -1 +1 @@
-char *version_string = "gcc-3.0.0 970802 experimental";
+char *version_string = "egcs-1.0.0 970814 (gcc2-970802 experimental)";