diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index 672c5acd..5e9df73e 100644
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -40,7 +40,7 @@ added after the original pull request but before a merge.
   than cosmetic changes).
 * Add some Javadocs.
 * A few unit tests would help a lot as well -- someone has to do it.
-* If no-one else is using your branch, please rebase it against the current master (or
+* If no-one else is using your branch, please rebase it against the current main (or
   other target branch in the main project).
 * When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions].
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 0cb02ee5..f296914e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -149,7 +149,7 @@ pipeline {
 		stage('Release documentation') {
 			when {
 				anyOf {
-					branch 'master'
+					branch 'main'
 					branch 'release'
 				}
 			}
diff --git a/README.adoc b/README.adoc
index e430f991..440e5bf2 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,7 +1,7 @@
 image:https://spring.io/badges/spring-ws/ga.svg["Spring Web Services", link="https://spring.io/projects/spring-ws#learn"]
 image:https://spring.io/badges/spring-ws/snapshot.svg["Spring Web Services", link="https://spring.io/projects/spring-ws#learn"]
 
-image:https://jenkins.spring.io/buildStatus/icon?job=spring-ws%2Fmaster&subject=3.1.x[link=https://jenkins.spring.io/view/SpringWebServices/job/spring-ws/]
+image:https://jenkins.spring.io/buildStatus/icon?job=spring-ws%2Fmain&subject=3.1.x[link=https://jenkins.spring.io/view/SpringWebServices/job/spring-ws/]
 image:https://jenkins.spring.io/buildStatus/icon?job=spring-ws%2F3.x&subject=3.0.x[link=https://jenkins.spring.io/view/SpringWebServices/job/spring-ws/]
 image:https://jenkins.spring.io/buildStatus/icon?job=spring-ws%2F2.x&subject=2.4.x[link=https://jenkins.spring.io/view/SpringWebServices/job/spring-ws/]
 
diff --git a/src/main/asciidoctor/server.adoc b/src/main/asciidoctor/server.adoc
index f6aec6fe..edfae900 100644
--- a/src/main/asciidoctor/server.adoc
+++ b/src/main/asciidoctor/server.adoc
@@ -434,7 +434,7 @@ The following example shows how to set up the server-side XMPP components:
 
 === MTOM
 
-https://en.wikipedia.org/wiki/Message_Transmission_Optimization_Mechanism[MTOM] is the mechanism for sending binary data to and from Web Services. You can look at how to implement this with Spring WS through the https://github.com/spring-projects/spring-ws-samples/tree/master/mtom[MTOM sample].
+https://en.wikipedia.org/wiki/Message_Transmission_Optimization_Mechanism[MTOM] is the mechanism for sending binary data to and from Web Services. You can look at how to implement this with Spring WS through the https://github.com/spring-projects/spring-ws-samples/tree/main/mtom[MTOM sample].
 
 [[server-endpoints]]
 == Endpoints