diff --git a/CHANGES.md b/CHANGES.md
index 25b114036..4fdc0fdc8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -33,7 +33,7 @@
   anyway. [#227]
 
 - The infrastructure of the package has been updated in line with the
-  APE 17 roadmap (https://github.com/astropy/astropy-APEs/blob/master/APE17.rst).
+  APE 17 roadmap (https://github.com/astropy/astropy-APEs/blob/main/APE17.rst).
   The main changes are that the ``python setup.py test`` and
   ``python setup.py build_docs`` commands will no longer work. The
   easiest way to replicate these commands is to install the tox
diff --git a/README.rst b/README.rst
index bf7d7028b..1c9fd999d 100644
--- a/README.rst
+++ b/README.rst
@@ -22,11 +22,10 @@ https://reproject.readthedocs.io
 .. figure:: https://github.com/astrofrog/reproject/raw/master/docs/images/index-4.png
    :alt: screenshot
 
-.. |Build Status| image:: https://dev.azure.com/astropy-project/reproject/_apis/build/status/astropy.reproject?branchName=master
-   :target: https://dev.azure.com/astropy-project/reproject/_build/latest?definitionId=3&branchName=master
-.. |Build status| image:: https://ci.appveyor.com/api/projects/status/0ifg4xonlyrc6eu4/branch/master?svg=true
-   :target: https://ci.appveyor.com/project/Astropy/reproject/branch/master
-.. |Coverage Status| image:: https://codecov.io/gh/astropy/reproject/branch/master/graph/badge.svg
+.. |Build Status| image:: https://dev.azure.com/astropy-project/reproject/_apis/build/status/astropy.reproject?branchName=main
+   :target: https://dev.azure.com/astropy-project/reproject/_build/latest?definitionId=3&branchName=main
+.. |Build status| image:: https://ci.appveyor.com/api/projects/status/0ifg4xonlyrc6eu4/branch/main?svg=true
+   :target: https://ci.appveyor.com/project/Astropy/reproject/branch/main
+.. |Coverage Status| image:: https://codecov.io/gh/astropy/reproject/branch/main/graph/badge.svg
    :target: https://codecov.io/gh/astropy/reproject
 .. |Powered by Astropy Badge| image:: http://img.shields.io/badge/powered%20by-AstroPy-orange.svg?style=flat
-
diff --git a/docs/conf.py b/docs/conf.py
index d607846fa..b6a7ab58b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -151,7 +151,7 @@
     if versionmod.version.release:
         edit_on_github_branch = "v" + versionmod.version.version
     else:
-        edit_on_github_branch = "master"
+        edit_on_github_branch = "main"
 
     edit_on_github_source_root = ""
     edit_on_github_doc_root = "docs"