diff --git a/ChangeLog b/ChangeLog
index ea0755da3255752313b02a315cb6e7fd0a9b7ff7_Q2hhbmdlTG9n..4d5331fca01012f4dece19c83fd6184a85c4b9e5_Q2hhbmdlTG9n 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-03-13  Johannes Ziegler <ziegler@bach.informatik.uni-ulm.de>
+
+	* crypt.el (crypt-encoding-alist): Gzip Files with .gz and .tgz
+	extension.
+	(crypt-find-file-hook): renaming of then ungzipped buffers
+	name.gz => name and name.tgz => name.tar
+
 2000-02-23  Jan Vroonhof  <vroonhof@math.ethz.ch>
 
 	* jka-compr.el: Globally replace 'no-conversion with 'binary
diff --git a/crypt.el b/crypt.el
index ea0755da3255752313b02a315cb6e7fd0a9b7ff7_Y3J5cHQuZWw=..4d5331fca01012f4dece19c83fd6184a85c4b9e5_Y3J5cHQuZWw= 100644
--- a/crypt.el
+++ b/crypt.el
@@ -1028,7 +1028,7 @@
    ;; gzip (GNU zip)
    (list 'gzip
          "\037\213" nil
-         "\\(\\.g?z\\)$"
+         "\\.\\(tgz\\|g?z\\)$"
          "gzip" "gzip"
          "--quiet" "--decompress --quiet"
          "Zip"
@@ -1317,6 +1317,10 @@
                     (string-match "\\.gz$" buffer-file-name))
                (set-visited-file-name
                 (substring buffer-file-name 0 (match-beginning 0))))
+	   (if (and (not (null-buffer-file-name))
+		    (string-match "\\.tgz$" buffer-file-name))
+	       (set-visited-file-name
+		(concat (substring buffer-file-name 0 (match-beginning 0)) ".tar"))
            (if (and (not (null buffer-file-name))
                     (string-match "\\.bz2$" buffer-file-name))
                (set-visited-file-name