diff --git a/security/1password-cli/Portfile b/security/1password-cli/Portfile
index 691988be8d5cc..e51fbc186f057 100644
--- a/security/1password-cli/Portfile
+++ b/security/1password-cli/Portfile
@@ -4,7 +4,7 @@ PortSystem          1.0
 
 name                1password-cli
 version             2.30.3
-revision            0
+revision            1
 
 homepage            https://support.1password.com/command-line
 
@@ -46,10 +46,27 @@ build               {}
 post-extract {
     system -W ${pkg_workpath} "cat ./Payload | gzip -d > ./Payload.cpio"
     system -W ${pkg_workpath} "cat ./Payload.cpio | cpio -i"
+
+    foreach shell {bash fish zsh} {
+        system -W ${pkg_workpath} \
+          "./${bin_name} completion ${shell} > ${name}.${shell}"
+    }
 }
 
 destroot {
     xinstall -m 0755 ${pkg_workpath}/${bin_name} ${destroot}${prefix}/bin
+
+    set bash_comp_path ${destroot}${prefix}/share/bash-completion/completions
+    xinstall -m 0755 -d ${bash_comp_path}
+    xinstall -m 0644 ${pkg_workpath}/${name}.bash ${bash_comp_path}/${name}
+
+    set fish_comp_path ${destroot}${prefix}/share/fish/vendor_completions.d
+    xinstall -m 0755 -d ${fish_comp_path}
+    xinstall -m 0644 ${pkg_workpath}/${name}.fish ${fish_comp_path}
+
+    set zsh_comp_path ${destroot}${prefix}/share/zsh/site-functions
+    xinstall -m 0755 -d ${zsh_comp_path}
+    xinstall -m 0644 ${pkg_workpath}/${name}.zsh ${zsh_comp_path}/_${name}
 }
 
 livecheck.type      regex