diff --git a/winsup/cygwin/scripts/mkvers.sh b/winsup/cygwin/scripts/mkvers.sh
index b2db73cc7..96af936ec 100755
--- a/winsup/cygwin/scripts/mkvers.sh
+++ b/winsup/cygwin/scripts/mkvers.sh
@@ -105,15 +105,6 @@ wv_cvs_tag="$cvs_tag"
 # and set dir accordingly.
 dir=$(echo $dir | sed -e 's%/include/cygwin.*$%%' -e 's%include/cygwin.*$%.%')
 
-# Look in $dir for a a ".snapshot-date" file.  If one is found then this
-# information will be saved for output to the DLL.
-#
-if [ -r "$dir/.snapshot-date" ]; then
-  read snapshotdate < "$dir/.snapshot-date"
-  snapshot="snapshot date
-$snapshotdate"
-fi
-
 #
 # Scan the version.h file for strings that begin with CYGWIN_INFO or
 # CYGWIN_VERSION.  Perform crude parsing on the lines to get the values
@@ -129,7 +120,6 @@ fi
 \2%p' $incfile | sed -e 's/["\\]//g'  -e '/^_/y/ABCDEFGHIJKLMNOPQRSTUVWXYZ_/abcdefghijklmnopqrstuvwxyz /';
   echo ' build date'; echo $build_date;
   [ -n "$cvs_tag" ] && echo "$cvs_tag";
-  [ -n "$snapshot" ] && echo "$snapshot"
 ) | while read var; do
     read val
 cat <<EOF
@@ -139,13 +129,6 @@ done | tee /tmp/mkvers.$$ 1>&9
 
 trap "rm -f /tmp/mkvers.$$" 0 1 2 15
 
-if [ -n "$snapshotdate" ]; then
-  usedate="$(echo $snapshotdate \
-	     | sed -e 's/\(....\)\(..\)\(..\)-\(..:..\).*$/\1-\2-\3 \4SNP/')"
-else
-  usedate="$builddate"
-fi
-
 #
 # Finally, output the shared ID and set up the cygwin_version structure
 # for use by Cygwin itself.
@@ -163,7 +146,7 @@ cygwin_version_info cygwin_version =
   CYGWIN_VERSION_DLL_MAJOR, CYGWIN_VERSION_DLL_MINOR,
   CYGWIN_VERSION_SHARED_DATA,
   CYGWIN_VERSION_MOUNT_REGISTRY,
-  "$usedate",
+  "$builddate",
 #ifdef DEBUGGING
   CYGWIN_VERSION_DLL_IDENTIFIER "S" shared_data_version "-$builddate"
 #else
diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc
index 136b1c57a..7e0d8849b 100644
--- a/winsup/cygwin/uname.cc
+++ b/winsup/cygwin/uname.cc
@@ -32,7 +32,6 @@ uname_x (struct utsname *name)
   __try
     {
       char buf[NI_MAXHOST + 1] ATTRIBUTE_NONSTRING;
-      char *snp = strstr (cygwin_version.dll_build_date, "SNP");
 
       memset (name, 0, sizeof (*name));
       /* sysname */
@@ -50,8 +49,6 @@ uname_x (struct utsname *name)
 		       cygwin_version.api_minor);
       /* version */
       stpcpy (name->version, cygwin_version.dll_build_date);
-      if (snp)
-	name->version[snp - cygwin_version.dll_build_date] = '\0';
       strcat (name->version, " UTC");
       /* machine */
       switch (wincap.cpu_arch ())
@@ -63,8 +60,6 @@ uname_x (struct utsname *name)
 	    strcpy (name->machine, "unknown");
 	    break;
 	}
-      if (snp)
-	strcat (name->release, ".snap");
       /* domainame */
       memset (buf, 0, sizeof buf);
       getdomainname (buf, sizeof buf - 1);
@@ -91,8 +86,6 @@ uname (struct utsname *in_name)
   struct old_utsname *name = (struct old_utsname *) in_name;
   __try
     {
-      char *snp = strstr  (cygwin_version.dll_build_date, "SNP");
-
       memset (name, 0, sizeof (*name));
       __small_sprintf (name->sysname, "CYGWIN_%s", wincap.osname ());
 
@@ -100,11 +93,10 @@ uname (struct utsname *in_name)
       cygwin_gethostname (name->nodename, sizeof (name->nodename) - 1);
 
       /* Cygwin dll release */
-      __small_sprintf (name->release, "%d.%d.%d%s(%d.%d/%d/%d)",
+      __small_sprintf (name->release, "%d.%d.%d(%d.%d/%d/%d)",
 		       cygwin_version.dll_major / 1000,
 		       cygwin_version.dll_major % 1000,
 		       cygwin_version.dll_minor,
-		       snp ? "s" : "",
 		       cygwin_version.api_major,
 		       cygwin_version.api_minor,
 		       cygwin_version.shared_data,
@@ -112,8 +104,6 @@ uname (struct utsname *in_name)
 
       /* Cygwin "version" aka build date */
       strcpy (name->version, cygwin_version.dll_build_date);
-      if (snp)
-	name->version[snp - cygwin_version.dll_build_date] = '\0';
 
       /* CPU type */
       switch (wincap.cpu_arch ())