diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 38f34e7..4e5ec07 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -1,10 +1,10 @@
 name: Build and test
 
 on:
-    # Build on pushes to master
+    # Build on pushes to main
     push:
         branches:
-            - master
+            - main
         tags:
     # Build pull requests
     pull_request:
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c2e06f8..ef70398 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,7 @@ News
 ------------------
 
 - Multiple file input support.
+- Rename "master" git branch to "main".
 
 
 3.0.0 (2021-08-19)
diff --git a/contributing.md b/contributing.md
index d0be760..f57a051 100644
--- a/contributing.md
+++ b/contributing.md
@@ -14,8 +14,8 @@ You can contribute to this project in several ways.
 
 Git branches and their purpose and status at the time of this writing are listed below.
 
-*   [master](https://github.com/Pylons/webtest/) - The branch which should always be *deployable*. The default branch on GitHub.
-*   For development, create a new branch. If changes on your new branch are accepted, they will be merged into the master branch and deployed.
+*   [main](https://github.com/Pylons/webtest/) - The branch which should always be *deployable*. The default branch on GitHub.
+*   For development, create a new branch. If changes on your new branch are accepted, they will be merged into the main branch and deployed.
 
 ## Prerequisites
 
diff --git a/docs/conf.py b/docs/conf.py
index 96746bf..cab66ed 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'
 
-# The master toctree document.
+# The main toctree document.
 master_doc = 'index'
 
 # General information about the project.
diff --git a/docs/index.rst b/docs/index.rst
index 42fddf0..f0d5544 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -34,7 +34,7 @@ Or if you want the development version:
 
 .. code-block:: sh
 
-    $ pip install https://nodeload.github.com/Pylons/webtest/tar.gz/master
+    $ pip install https://nodeload.github.com/Pylons/webtest/tar.gz/main
 
 What This Does
 ==============