diff --git a/.gitignore b/.gitignore
index 82914db..b619295 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /stratis-cli-0.5.0.tar.gz
 /stratis-cli-0.5.2.tar.gz
 /stratis-cli-0.5.3.tar.gz
+/stratis-cli-0.5.5.tar.gz
diff --git a/sources b/sources
index 43e73c2..b4a1d01 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (stratis-cli-0.5.3.tar.gz) = d2c92e3bc90c8f4cc80b3ff0c2e86cf1baba850f5450228955f3edca93a693a409e4babdcad5d6bbd4e294eb543121a2adabda91ec406e0486f0faf191c1f97e
+SHA512 (stratis-cli-0.5.5.tar.gz) = 82d21b81ed5be8a101721a3633abaedb3932049c516c5c0b5161c4e0e3190a347d31e822cd360301348aff375eb8d68aa47ca57e7dea9ab5fe579afc56aa15a9
diff --git a/stratis-cli.spec b/stratis-cli.spec
index 18d5e1a..47c811d 100644
--- a/stratis-cli.spec
+++ b/stratis-cli.spec
@@ -1,8 +1,8 @@
 %{?python_enable_dependency_generator}
 
 Name:           stratis-cli
-Version:        0.5.3
-Release:        3%{?dist}
+Version:        0.5.5
+Release:        1%{?dist}
 Summary:        Command-line tool for interacting with the Stratis daemon
 
 License:        ASL 2.0
@@ -24,6 +24,16 @@ stratis provides a command-line interface (CLI) for
 interacting with the Stratis daemon, stratisd. stratis
 interacts with stratisd via D-Bus.
 
+%package zsh
+Summary:        %{name} zsh completion support
+BuildArch:      noarch
+Requires:       %{name} = %{version}-%{release}
+Requires:       zsh
+
+%description    zsh
+This package provides zsh completion script for %{name}.
+
+
 %prep
 %autosetup
 
@@ -34,7 +44,9 @@ a2x -f manpage docs/stratis.txt
 %install
 %py3_install
 %{__install} -Dpm0644 -t %{buildroot}%{_datadir}/bash-completion/completions \
-  etc/bash_completion.d/stratis
+  shell-completion/bash/stratis
+%{__install} -Dpm0644 -t %{buildroot}%{_datadir}/zsh/site-functions \
+  shell-completion/zsh/_stratis
 %{__install} -Dpm0644 -t %{buildroot}%{_mandir}/man8 docs/stratis.8
 
 %files
@@ -46,7 +58,14 @@ a2x -f manpage docs/stratis.txt
 %{python3_sitelib}/stratis_cli/
 %{python3_sitelib}/stratis_cli-*.egg-info/
 
+%files zsh
+%{_datadir}/zsh/site-functions/_stratis
+
 %changelog
+* Thu Aug 2 2018 Andy Grover <agrover@redhat.com> - 0.5.5-1
+- Update to 0.5.5
+- Add zsh completions subpackage
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild