diff --git a/disable-broken-doc-code.patch b/disable-broken-doc-code.patch
new file mode 100644
index 0000000..835bc7b
--- /dev/null
+++ b/disable-broken-doc-code.patch
@@ -0,0 +1,17 @@
+diff --git a/doc_src/fish_synopsis.py b/doc_src/fish_synopsis.py
+index 51df271..a674902 100644
+--- a/doc_src/fish_synopsis.py
++++ b/doc_src/fish_synopsis.py
+@@ -23,9 +23,9 @@ class FishSynopsisDirective(CodeBlock):
+     required_arguments = 0
+ 
+     def run(self):
+-        if self.env.app.builder.name != "man":
+-            self.arguments = ["fish-synopsis"]
+-            return CodeBlock.run(self)
++        # if self.env.app.builder.name != "man":
++        #     self.arguments = ["fish-synopsis"]
++        #     return CodeBlock.run(self)
+         lexer = FishSynopsisLexer()
+         result = nodes.line_block()
+         for (start, tok, text) in lexer.get_tokens_unprocessed("\n".join(self.content)):
diff --git a/fish.spec b/fish.spec
index d2f6284..5d9ec98 100644
--- a/fish.spec
+++ b/fish.spec
@@ -5,7 +5,7 @@
 
 Name:           fish
 Version:        %{version_base}%{?gitnum:^%{gitnum}g%{githashshort}}
-Release:        1
+Release:        2
 Summary:        Friendly interactive shell
 # GPLv2
 #   - src/fish.cpp
@@ -36,6 +36,10 @@ Source2:        gpgkey-003837986104878835FA516D7A67D962D88A709A.gpg
 %else
 Source0:        https://github.com/fish-shell/fish-shell/archive/%{githash}/%{name}-%{githash}.tar.gz
 %endif
+%if 0%{?el8}
+# Disable sphinx logic that's incompatible with the version in el8
+Patch1:         disable-broken-doc-code.patch
+%endif
 
 BuildRequires:  cmake >= 3.5
 BuildRequires:  ninja-build
@@ -93,7 +97,11 @@ done
 
 # We still need to slightly manually adapt the pkgconfig file and remove
 # some /usr/local/ references (RHBZ#1869376)
+%if 0%{?el8}
+sed -i 's^/usr/local/^/usr/^g' *.pc
+%else
 sed -i 's^/usr/local/^/usr/^g' %{_vpath_builddir}/*.pc
+%endif
 
 %install
 %cmake_install
@@ -110,7 +118,11 @@ cp -a CONTRIBUTING.rst %{buildroot}%{_pkgdocdir}
 
 %check
 # Sadly, ctest is broken
+%if 0%{?el8}
+%ninja_build test
+%else
 %ninja_build -C %{_vpath_builddir} test
+%endif
 desktop-file-validate %{buildroot}%{_datadir}/applications/fish.desktop
 
 %post
@@ -142,6 +154,9 @@ fi
 %{_datadir}/pixmaps/fish.png
 
 %changelog
+* Tue Sep 06 2022 Davide Cavalca <dcavalca@centosproject.org> 3.5.1-2
+- Make it build on el8
+
 * Mon Aug 15 2022 Siteshwar Vashisht <svashisht@redhat.com> 3.5.1-1
 - Update to 3.5.1