diff --git a/docker.changes b/docker.changes
index c05d356..b625757 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec 14 13:45:56 UTC 2020 - Robert Munteanu <rombert@apache.org>
+
+- Enable fish-completion
+
 -------------------------------------------------------------------
 Thu Nov 12 18:36:26 UTC 2020 - Michał Rostecki <mrostecki@suse.com>
 
diff --git a/docker.spec b/docker.spec
index 2cada94..86e04a0 100644
--- a/docker.spec
+++ b/docker.spec
@@ -100,6 +100,7 @@ BuildRequires:  libtool
 BuildRequires:  procps
 BuildRequires:  sqlite3-devel
 BuildRequires:  zsh
+BuildRequires:  fish
 BuildRequires:  pkgconfig(libsystemd)
 Requires:       apparmor-parser
 Requires:       ca-certificates-mozilla
@@ -216,6 +217,16 @@ Provides:       %{realname}-zsh-completion = %{version}
 %description zsh-completion
 Zsh command line completion support for %{name}.
 
+%package fish-completion
+Summary:        Fish completion for %{name}
+Group:          System/Shells
+Requires:       %{name} = %{version}
+Supplements:    packageand(%{name}:fish)
+BuildArch:      noarch
+
+%description fish-completion
+Fish command line completion support for %{name}.
+
 %package test
 %global __requires_exclude ^libgo.so.*$
 Summary:        Test package for docker
@@ -372,6 +383,7 @@ install -Dd -m 0755 \
 
 install -D -m0644 components/cli/contrib/completion/bash/docker "%{buildroot}%{_datarootdir}/bash-completion/completions/%{realname}"
 install -D -m0644 components/cli/contrib/completion/zsh/_docker "%{buildroot}%{_sysconfdir}/zsh_completion.d/_%{realname}"
+install -D -m0644 components/cli/contrib/completion/fish/docker.fish "%{buildroot}/%{_datadir}/fish/vendor_completions.d/%{realname}.fish"
 
 #
 # systemd service
@@ -500,6 +512,10 @@ grep -q '^dockremap:' /etc/subgid || \
 %defattr(-,root,root)
 %{_sysconfdir}/zsh_completion.d/_%{realname}
 
+%files fish-completion
+%defattr(-,root,root)
+%{_datadir}/fish/vendor_completions.d/%{realname}.fish
+
 %files test
 %defattr(-,root,root)
 %{_prefix}/src/docker/