diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5996ce06f..9d6fa31d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@
 - fish source tarballs are now distributed using the XZ compression method (#5460).
 - Allow finishing builds on OS X <10.13.6 (previously builds would fail at the `codesign` step)
 - The pkg-config file now uses pkg-config variables
+- The default values for the extra_completionsdir, extra_functionsdir and extra_confdir options now use the installation prefix instead of hardcoding `/usr/local`
 
 ---
 
diff --git a/cmake/Install.cmake b/cmake/Install.cmake
index 3b8a5626e..67331f93f 100644
--- a/cmake/Install.cmake
+++ b/cmake/Install.cmake
@@ -29,15 +29,15 @@ set(rel_functionsdir "fish/vendor_functions.d")
 set(rel_confdir "fish/vendor_conf.d")
 
 set(extra_completionsdir
-    "/usr/local/share/${rel_completionsdir}"
+    "${datadir}/${rel_completionsdir}"
     CACHE STRING "Path for extra completions")
 
 set(extra_functionsdir
-    "/usr/local/share/${rel_functionsdir}"
+    "${datadir}/${rel_functionsdir}"
     CACHE STRING "Path for extra functions")
 
 set(extra_confdir
-    "/usr/local/share/${rel_confdir}"
+    "${datadir}/${rel_confdir}"
     CACHE STRING "Path for extra configuration")
 
 # These are the man pages that go in system manpath; all manpages go in the fish-specific manpath.