diff --git a/bash_completion b/bash_completion
index 188a8b4c..3210ad67 100644
--- a/bash_completion
+++ b/bash_completion
@@ -73,7 +73,7 @@ complete -f -X '!*.?(t)bz?(2)' bunzip2 bzcat pbunzip2 pbzcat
 complete -f -X '!*.@(zip|ZIP|jar|JAR|exe|EXE|pk3|war|wsz|ear|zargo|xpi|sxw|ott|od[fgpst]|epub)' unzip zipinfo
 complete -f -X '*.Z' compress znew
 # zcmp, zdiff, z*grep, zless, zmore intentionally not here, see Debian: #455510
-complete -f -X '!*.@(Z|gz|tgz|Gz|dz)' gunzip zcat unpigz
+complete -f -X '!*.@(Z|gz|t[ag]z|Gz|dz)' gunzip zcat unpigz
 complete -f -X '!*.Z' uncompress
 # lzcmp, lzdiff intentionally not here, see Debian: #455510
 complete -f -X '!*.lzma' lzcat lzegrep lzfgrep lzgrep lzless lzmore unlzma
diff --git a/contrib/gzip b/contrib/gzip
index 08243857..931423d5 100644
--- a/contrib/gzip
+++ b/contrib/gzip
@@ -24,7 +24,7 @@ _gzip()
 
     local IFS=$'\t\n'
 
-    xspec="*.?(t)gz"
+    xspec="*.@(gz|t[ag]z)"
     if [[ "$prev" == --* ]]; then
         [[ "$prev" == --decompress || \
             "$prev" == --list || \