diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 1e9ec8b11..f7d3d8a2f 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,4 +8,4 @@ Fixes issue #
 <!-- Just check off what what we know been done so far. We can help you with this stuff. -->
 - [ ] Changes to fish usage are reflected in user documentation/manpages.
 - [ ] Tests have been added for regressions fixed
-- [ ] User-visible changes noted in CHANGELOG.md
+- [ ] User-visible changes noted in CHANGELOG.rst
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 14ace13c2..b5bb25c26 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -15,7 +15,7 @@ Fish source should limit the C++ features it uses to those available in
 C++11. It should not use exceptions.
 
 Before introducing a new dependency, please make it optional with
-graceful failure if possible. Add any new dependencies to the README.md
+graceful failure if possible. Add any new dependencies to the README.rst
 under the *Running* and/or *Building* sections.
 
 Versioning
diff --git a/README.rst b/README.rst
index 5e6efa4c5..ff2f40800 100644
--- a/README.rst
+++ b/README.rst
@@ -214,7 +214,7 @@ On RedHat, CentOS, or Amazon EC2:
 Contributing Changes to the Code
 --------------------------------
 
-See the `Guide for Developers <CONTRIBUTING.md>`__.
+See the `Guide for Developers <CONTRIBUTING.rst>`__.
 
 Contact Us
 ----------
diff --git a/cmake/Install.cmake b/cmake/Install.cmake
index 67331f93f..5574b7894 100644
--- a/cmake/Install.cmake
+++ b/cmake/Install.cmake
@@ -153,7 +153,7 @@ install(DIRECTORY share/tools/web_config
 install(FILES ${MANUALS} DESTINATION ${mandir}/man1/ OPTIONAL)
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/user_doc/html/ # Trailing slash is important!
         DESTINATION ${docdir} OPTIONAL)
-install(FILES CHANGELOG.md DESTINATION ${docdir})
+install(FILES CHANGELOG.rst DESTINATION ${docdir})
 
 install(FILES share/lynx.lss DESTINATION ${rel_datadir}/fish/)
 
diff --git a/fish.spec.in b/fish.spec.in
index 1a0e3e33b..8ee2a7769 100644
--- a/fish.spec.in
+++ b/fish.spec.in
@@ -87,8 +87,8 @@ make %{?_smp_mflags}
 %if 0%{?suse_version}
 %suse_update_desktop_file fish "System;TerminalEmulator"
 %endif
-cp -a README.md %{buildroot}%{_pkgdocdir}
-cp -a CONTRIBUTING.md %{buildroot}%{_pkgdocdir}
+cp -a README.rst %{buildroot}%{_pkgdocdir}
+cp -a CONTRIBUTING.rst %{buildroot}%{_pkgdocdir}
 
 %check
 # OpenSUSE does out-of-tree builds and defines __builddir