diff --git a/CHANGES b/CHANGES
index aa4ae25e..68711bbe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -30,7 +30,7 @@ bash-completion (2.x)
     vncviewer, yp-tools, and general hostname completions.
   * Add abook and wtf completion, based on work by Raphaël Droz.
   * Add cvsps, dragon, fusermount, jarsigner, k3b, lftpget, pm-utils, rtcwake,
-    pack200 and unpack200 completions.
+    pack200, unpack200, pigz and unpigz completions.
   * Don't overwrite other host completions when completing from multiple
     SSH known hosts files.
   * Speed up installed rpm package completion on SUSE, based on work by
diff --git a/bash_completion b/bash_completion
index 6b03e939..6a864845 100644
--- a/bash_completion
+++ b/bash_completion
@@ -73,7 +73,7 @@ complete -f -X '!*.?(t)bz?(2)' bunzip2 bzcat
 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
+complete -f -X '!*.@(Z|gz|tgz|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 48f97011..94f8c9df 100644
--- a/contrib/gzip
+++ b/contrib/gzip
@@ -1,6 +1,6 @@
 # bash completion for gzip
 
-have gzip &&
+have gzip || have pigz &&
 _gzip()
 {
     local cur prev xspec helpopts
@@ -37,7 +37,7 @@ _gzip()
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
         $( compgen -d -- "$cur" ) )
 } &&
-complete -F _gzip -o filenames gzip
+complete -F _gzip -o filenames gzip pigz
 
 # Local variables:
 # mode: shell-script