diff --git a/fish.spec b/fish.spec
index 5b19383..867b31e 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,6 +1,6 @@
 Name:           fish
 Version:        3.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Friendly interactive shell
 
 # GPLv2
@@ -65,9 +65,18 @@ for f in $(find share/tools -type f -name '*.py'); do
 done
 
 %build
-%cmake . -B%{_vpath_builddir} -GNinja -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}
+%cmake . -B%{_vpath_builddir} -GNinja \
+    -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \
+    -Dextra_completionsdir=%{_datadir}/%{name}/vendor_completions.d \
+    -Dextra_functionsdir=%{_datadir}/%{name}/vendor_functions.d \
+    -Dextra_confdir=%{_datadir}/%{name}/vendor_conf.d
+
 %ninja_build -C %{_vpath_builddir} all fish_tests
 
+# We still need to slightly manually adapt the pkgconfig file and remove
+# some /usr/local/ references (RHBZ#1869376)
+sed -i 's^/usr/local/^/usr/^g' %{_vpath_builddir}/*.pc
+
 %install
 %ninja_install -C %{_vpath_builddir}
 
@@ -111,6 +120,9 @@ fi
 %{_pkgdocdir}
 
 %changelog
+* Tue Aug 25 2020 Oliver Falk <oliver@linux-kernel.at> - 3.1.2-5
+- Correct pkgconfig references to /usr/local (RHBZ#1869376)
+
 * Mon Aug 17 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 3.1.2-4
 - Remove automagic Python bytecompilation | Fix FTBFS f33 | RH#1863559