diff --git a/conda.spec b/conda.spec
index 45f06ab..f847844 100644
--- a/conda.spec
+++ b/conda.spec
@@ -2,7 +2,7 @@
 
 Name:           conda
 Version:        4.8.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cross-platform, Python-agnostic binary package manager
 
 License:        BSD and ASL 2.0 and LGPLv2+ and MIT
@@ -98,6 +98,13 @@ Provides:       bundled(python%{python3_pkgversion}-toolz) = 0.8.2
 
 %description -n python%{python3_pkgversion}-conda %_description
 
+%package fish
+Summary: %{summary}
+Requires: fish
+Requires: conda = %{version}-%{release}
+
+%description fish %_description
+
 %prep
 %autosetup -p1
 
@@ -154,9 +161,11 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/conda/pkgs/cache
 
 # install does not create the directory on EL7
 install -m 0644 -Dt %{buildroot}/etc/profile.d/ conda/shell/etc/profile.d/conda.{sh,csh}
+install -m 0644 -Dt %{buildroot}/etc/fish/conf.d conda/shell/etc/fish/conf.d/conda.fish
 sed -r -i '1i CONDA_EXE=%{_bindir}/conda' %{buildroot}/etc/profile.d/conda.sh
 sed -r -i -e '1i set _CONDA_EXE=%{_bindir}/conda\nset _CONDA_ROOT=' \
           -e 's/CONDA_PFX=.*/CONDA_PFX=/' %{buildroot}/etc/profile.d/conda.csh
+sed -r -i '1i set -x CONDA_EXE %{_bindir}/conda' %{buildroot}/etc/fish/conf.d/conda.fish
 
 # Install bash completion script
 install -m 0644 -Dt %{buildroot}%{bash_completionsdir}/ %SOURCE1
@@ -196,8 +205,13 @@ py.test-%{python3_version} -vv -m "not integration" \
 %{_localstatedir}/cache/conda/
 %{_datadir}/conda/
 
+%files fish
+%{_sysconfdir}/fish/conf.d/conda.fish
 
 %changelog
+* Fri Jul 17 2020 Steve Traylen <steve.traylen@cern.ch> - 4.8.3-3
+- Create conda-fish subpackage
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 4.8.3-2
 - Rebuilt for Python 3.9