diff --git a/doggo.changes b/doggo.changes
index 7c2ff86..ff9fca3 100644
--- a/doggo.changes
+++ b/doggo.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Oct 23 09:36:30 UTC 2023 - Eyad Issa <eyadlorenzo@gmail.com>
+
+- Packaging improvements:
+  * Fix zsh-completion and fish-completion by not requiring
+    zsh-completion and fish-completion and by supplementing the 
+    right package.
+  * Fix fish-completion by using the .fish suffix when copying the
+    completion file.
+
 -------------------------------------------------------------------
 Wed Oct 18 19:10:28 UTC 2023 - Jeff Kowalczyk <jkowalczyk@suse.com>
 
diff --git a/doggo.spec b/doggo.spec
index 1387ddb..c98e473 100644
--- a/doggo.spec
+++ b/doggo.spec
@@ -36,8 +36,7 @@ like DoH, DoT, DoQ, and DNSCrypt as well.
 %package fish-completion
 Summary:        fish completion for %{name}
 Group:          System/Shells
-Requires:       fish-completion
-Supplements:    (%{name} and fish-completion)
+Supplements:    (%{name} and fish)
 BuildArch:      noarch
 
 %description fish-completion
@@ -46,8 +45,7 @@ fish completion scripts for %{name}
 %package zsh-completion
 Summary:        zsh completion for %{name}
 Group:          System/Shells
-Requires:       zsh-completion
-Supplements:    (%{name} and zsh-completion)
+Supplements:    (%{name} and zsh)
 BuildArch:      noarch
 
 %description zsh-completion
@@ -67,7 +65,7 @@ go build ./cmd/api
 install -d %{buildroot}%{_bindir}
 install -D %{name} %{buildroot}%{_bindir}/%{name}
 install -D api %{buildroot}%{_bindir}/%{name}-api
-install -Dm644 completions/%{name}.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/%{name}
+install -Dm644 completions/%{name}.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/%{name}.fish
 install -Dm644 completions/%{name}.zsh %{buildroot}%{_datadir}/zsh/site-functions/_%{name}
 
 %files
@@ -83,7 +81,7 @@ install -Dm644 completions/%{name}.zsh %{buildroot}%{_datadir}/zsh/site-function
 %dir %{_datadir}/zsh/site-functions
 
 %files fish-completion
-%{_datadir}/fish/vendor_completions.d/%{name}
+%{_datadir}/fish/vendor_completions.d/%{name}.fish
 
 %files zsh-completion
 %{_datadir}/zsh/site-functions/_%{name}