diff --git a/.gitignore b/.gitignore
index 7b40fae..be9815c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,4 @@
 /salt-3003.1.tar.gz
 /salt-3003.2.tar.gz
 /salt-3003.3.tar.gz
+/salt-3004.tar.gz
diff --git a/contextvars.patch b/contextvars.patch
index 175a1f7..92b5153 100644
--- a/contextvars.patch
+++ b/contextvars.patch
@@ -3,8 +3,11 @@ diff -Nar -u0 a/requirements/base.txt b/requirements/base.txt
 +++ b/requirements/base.txt	2021-06-23 18:36:51.108332870 +0000
 @@ -7 +6,0 @@
 -contextvars
-diff -Nar -u0 a/requirements/zeromq.txt b/requirements/zeromq.txt
---- a/requirements/zeromq.txt	2021-06-09 14:25:03.000000000 +0000
-+++ b/requirements/zeromq.txt	2021-07-01 04:19:19.206766098 +0000
-@@ -4 +3,0 @@
+diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
+--- a/requirements/zeromq.txt
++++ b/requirements/zeromq.txt
+@@ -4,3 +4 @@
 -pyzmq<=20.0.0 ; python_version < "3.6"
+-pyzmq>=17.0.0,<22.0.0 ; python_version < "3.9"
+-pyzmq>19.0.2,<22.0.0 ; python_version >= "3.9"
++pyzmq>=17.0.0
diff --git a/salt.spec b/salt.spec
index c3efad4..d2b4244 100644
--- a/salt.spec
+++ b/salt.spec
@@ -13,9 +13,10 @@
 %define __rc_ver %{nil}
 
 %define fish_dir %{_datadir}/fish/vendor_functions.d
+%define zsh_dir %{_datadir}/zsh/site-functions
 
 Name:    salt
-Version: 3003.3%{?__rc_ver}
+Version: 3004%{?__rc_ver}
 Release: 1%{?dist}
 Summary: A parallel remote execution system
 Group:   System Environment/Daemons
@@ -260,6 +261,10 @@ install -p -m 0644  %{SOURCE19} %{buildroot}%{fish_dir}/salt-minion.fish
 install -p -m 0644  %{SOURCE20} %{buildroot}%{fish_dir}/salt-run.fish
 install -p -m 0644  %{SOURCE21} %{buildroot}%{fish_dir}/salt-syndic.fish
 
+# ZSH completion
+mkdir -p %{buildroot}%{zsh_dir}
+install -p -m 0644 pkg/salt.zsh %{buildroot}%{zsh_dir}/_salt
+
 popd
 
 
@@ -275,6 +280,7 @@ rm -rf %{buildroot}
 %{_sysconfdir}/bash_completion.d/salt.bash
 %{_var}/cache/salt
 %{_var}/log/salt
+%{zsh_dir}
 
 %doc $RPM_BUILD_DIR/python3-%{name}-%{version}-%{release}/LICENSE
 %doc $RPM_BUILD_DIR/python3-%{name}-%{version}-%{release}/README.fedora
@@ -284,6 +290,7 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/salt/
 %config(noreplace) %{_sysconfdir}/salt/pki
 %config(noreplace) %{fish_dir}/salt*.fish
+%config(noreplace) %{zsh_dir}/_salt
 
 %files master
 %defattr(-,root,root)
@@ -459,6 +466,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 19 2021 Salt Project Packaging <saltproject-packaging@vmware.com> - 3004-1
+- Update to feature release 3004-1 for Python 3
+
 * Wed Sep 08 2021 SaltStack Packaging Team <saltproject-packaging@vmware.com> - 3003.3-1
 - Update to CVE release 3003.3-1 https://saltproject.io/security_announcements/salt-security-advisory-2021-sep-02/
 
diff --git a/sources b/sources
index 9924fe2..dd00573 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (salt-3003.3.tar.gz) = 4fe50922833fce48fcc679adb16a0e1fe893531b2feb08b235a1461c58b8d9a72af2acd89fc0f712207fb0cd215d6b446e31a40001b46c43d0cc4ac827ce29e3
+SHA512 (salt-3004.tar.gz) = edc609daa5ccb4521950fa0df06383e502b49691e0a9f410f6985f3d1cb127905f89c3b0c88ffb88acf082dfa2011b6dd1aa714666c6af6ad09135aceb7dd228