diff --git a/ChangeLog b/ChangeLog
index 49159d4e3211281cb1b84de94f847a9618a39616_Q2hhbmdlTG9n..d68a2fdf1f9349964e0c68012d1cfc37571f2550_Q2hhbmdlTG9n 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-07-20  Darryl Okahata  <darrylo@sr.hp.com>
+
+	* tar-mode.el: `tar-regexp' must only match the names of
+	uncompressed tar files.  If it matches the names of compressed tar
+	files, tar-mode will attempt to parse the compressed tar file as
+	an uncompressed tar file, causing an error.  Note that this will
+	not affect either crypt.el nor jka-compr.el, as they will properly
+	uncompress a buffer before entering tar-mode.
+
 1999-07-15  SL Baur  <steve@beopen.com>
 
 	* jka-compr.el (jka-compr-install): Only diddle with
diff --git a/Makefile b/Makefile
index 49159d4e3211281cb1b84de94f847a9618a39616_TWFrZWZpbGU=..d68a2fdf1f9349964e0c68012d1cfc37571f2550_TWFrZWZpbGU= 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
 
 # This XEmacs package contains independent single file lisp packages
 
-VERSION = 1.17
+VERSION = 1.18
 AUTHOR_VERSION =
 MAINTAINER = XEmacs Development Team <xemacs-beta@xemacs.org>
 PACKAGE = os-utils
diff --git a/package-info.in b/package-info.in
index 49159d4e3211281cb1b84de94f847a9618a39616_cGFja2FnZS1pbmZvLmlu..d68a2fdf1f9349964e0c68012d1cfc37571f2550_cGFja2FnZS1pbmZvLmlu 100644
--- a/package-info.in
+++ b/package-info.in
@@ -1,7 +1,7 @@
 (os-utils
-  (standards-version 1.0
+  (standards-version 1.1
    version VERSION
    author-version AUTHOR_VERSION
    date DATE
    build-date BUILD_DATE
    maintainer MAINTAINER
@@ -3,9 +3,9 @@
    version VERSION
    author-version AUTHOR_VERSION
    date DATE
    build-date BUILD_DATE
    maintainer MAINTAINER
-   distribution stable
+   distribution xemacs
    priority medium
    category CATEGORY
    dump nil
diff --git a/tar-mode.el b/tar-mode.el
index 49159d4e3211281cb1b84de94f847a9618a39616_dGFyLW1vZGUuZWw=..d68a2fdf1f9349964e0c68012d1cfc37571f2550_dGFyLW1vZGUuZWw= 100644
--- a/tar-mode.el
+++ b/tar-mode.el
@@ -1310,8 +1310,13 @@
 ;;; Patch it in.
 
 ;;;###autoload
-(defvar tar-regexp "\\.\\(tar\\|tgz\\|tar\\.gz\\)\\'"
-  "The regular expression used to identify tar file names.")
+(defvar tar-regexp "\\.tar$"
+  "The regular expression used to identify tar file names.
+Note that this regular expression must not match compressed tar file
+names; if it does, tar-mode will attempt to parse the compressed tar
+file as an uncompressed tar file, which will generate an error.  This
+is not a problem, as other modules that handle compression will
+uncompress the buffer and call `tar-mode' appropriately.")
 
 ;;;###autoload
 (setq auto-mode-alist