diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index b9560d0137e..565f5e5b50b 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -76,6 +76,7 @@ nfpms:
   - rpm
   dependencies:
   - git
+  bindir: "/usr/bin"
   files:
     "completions/chezmoi-completion.bash": "/usr/share/bash-completion/completions/chezmoi"
     "completions/chezmoi.fish": "/usr/share/fish/completions/chezmoi.fish"
@@ -87,11 +88,15 @@ nfpms:
         386: i686
         arm: armhfp
         arm64: aarch64
+      files:
+        "completions/chezmoi.zsh": "/usr/share/zsh/functions/_chezmoi"
     deb:
       name_template: "{{ .ProjectName }}_{{ .Version }}-{{ .Env.TRAVIS_BUILD_NUMBER }}_{{ .Os }}_{{ .Arch }}"
       replacements:
         386: i386
         arm: armel
+      files:
+        "completions/chezmoi.zsh": "/usr/share/zsh/vendor-completions/_chezmoi"
 
 brews:
 - github:
diff --git a/goreleaser/goreleaser.yaml.tmpl b/goreleaser/goreleaser.yaml.tmpl
index 9717ed8eef7..fa8ba05833d 100644
--- a/goreleaser/goreleaser.yaml.tmpl
+++ b/goreleaser/goreleaser.yaml.tmpl
@@ -76,6 +76,7 @@ nfpms:
   - rpm
   dependencies:
   - git
+  bindir: "/usr/bin"
   files:
     "completions/chezmoi-completion.bash": "/usr/share/bash-completion/completions/chezmoi"
     "completions/chezmoi.fish": "/usr/share/fish/completions/chezmoi.fish"
@@ -87,11 +88,15 @@ nfpms:
         386: i686
         arm: armhfp
         arm64: aarch64
+      files:
+        "completions/chezmoi.zsh": "/usr/share/zsh/functions/_chezmoi"
     deb:
       name_template: "{{ .ProjectName }}_{{ .Version }}-{{ .Env.TRAVIS_BUILD_NUMBER }}_{{ .Os }}_{{ .Arch }}"
       replacements:
         386: i386
         arm: armel
+      files:
+        "completions/chezmoi.zsh": "/usr/share/zsh/vendor-completions/_chezmoi"
 
 brews:
 - github: