diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75db08e18..da9bc946c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -92,4 +92,4 @@ v1.0.0 takes the changes that were staged in the library-v2-stage-one branch. Th
 
 # 0.1.0 (September 29th, 2017)
 
-v0.1.0 is the original stable version of the library that was in master and has been maintained with no breaking API changes. This was in use by Consul prior to version 0.7.0.
+v0.1.0 is the original stable version of the library that was in main and has been maintained with no breaking API changes. This was in use by Consul prior to version 0.7.0.
diff --git a/README.md b/README.md
index d928c3b05..b246f3ac1 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Looking for some example code? https://github.com/Jille/raft-grpc-example
 As of September 2017, HashiCorp will start using tags for this library to clearly indicate
 major version updates. We recommend you vendor your application's dependency on this library.
 
-* v0.1.0 is the original stable version of the library that was in master and has been maintained
+* v0.1.0 is the original stable version of the library that was in main and has been maintained
 with no breaking API changes. This was in use by Consul prior to version 0.7.0.
 
 * v1.0.0 takes the changes that were staged in the library-v2-stage-one branch. This version
diff --git a/tag.sh b/tag.sh
index cd16623a7..ddea0cf31 100755
--- a/tag.sh
+++ b/tag.sh
@@ -11,6 +11,6 @@ fi
 # Generate the tag.
 echo "==> Tagging version $VERSION..."
 git commit --allow-empty -a --gpg-sign=348FFC4C -m "Release v$VERSION"
-git tag -a -m "Version $VERSION" -s -u 348FFC4C "v${VERSION}" master
+git tag -a -m "Version $VERSION" -s -u 348FFC4C "v${VERSION}" main
 
 exit 0