diff --git a/.ci/inc/fetch_ci_scripts.bash b/.ci/inc/fetch_ci_scripts.bash
index d608e405..835fe678 100644
--- a/.ci/inc/fetch_ci_scripts.bash
+++ b/.ci/inc/fetch_ci_scripts.bash
@@ -4,7 +4,7 @@ function fetch_ci_scripts() {
     local inc_dir
     local inc_url
     inc_dir="$(dirname "$0")/inc"
-    inc_url="${PMD_CI_SCRIPTS_URL:-https://raw.githubusercontent.com/pmd/build-tools/master/scripts}/inc"
+    inc_url="${PMD_CI_SCRIPTS_URL:-https://raw.githubusercontent.com/pmd/build-tools/main/scripts}/inc"
 
     mkdir -p "${inc_dir}"
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index badb9ab9..5de859c0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - main
-      - master
     tags:
       - '**'
   pull_request:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d347edb..38effdd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,20 @@
 
 ## Unreleased
 
+**New Git default branch - "main"**
+
+We are joining the Git community and updating "master" to "main". Using the term "master" for the main
+development branch can be offensive to some people. Existing versions of Git have been always capable of
+working with any branch name and since 2.28.0 (July 2020) the default initial branch is configurable
+(`init.defaultBranch`). Since October 2020, the default branch for new repositories on GitHub
+is "main". Finally, PMD will also use this new name for the main branch in all our own repositories.
+
 **Fixed issues:**
 
 **Merged pull requests:**
 
+* [#93](https://github.com/pmd/pmd-designer/pull/93) Change branch master to main by [@adangel](https://github.com/adangel)
+
 See https://github.com/pmd/pmd-designer/milestone/16
 
 ## 7.2.0
diff --git a/README.md b/README.md
index 7e0d4117..6d83d338 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # PMD Rule Designer
 
-[![Build Status](https://github.com/pmd/pmd-designer/workflows/build/badge.svg?branch=master)](https://github.com/pmd/pmd-designer/actions?query=workflow%3Abuild)
+[![Build Status](https://github.com/pmd/pmd-designer/workflows/build/badge.svg?branch=main)](https://github.com/pmd/pmd-designer/actions?query=workflow%3Abuild)
 [![Maven Central](https://img.shields.io/maven-central/v/net.sourceforge.pmd/pmd-designer.svg)](https://maven-badges.herokuapp.com/maven-central/net.sourceforge.pmd/pmd-designer)
 [![Join the chat](https://img.shields.io/gitter/room/pmd/pmd-designer)](https://app.gitter.im/#/room/#pmd_pmd-designer:gitter.im?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
diff --git a/releasing.md b/releasing.md
index 8ceacb14..93a6c4ab 100644
--- a/releasing.md
+++ b/releasing.md
@@ -1,6 +1,6 @@
 # Releasing pmd-designer
 
-1.  Checkout master branch:
+1.  Checkout main branch:
     
     ``` shell
     git clone https://github.com/pmd/pmd-designer.git
@@ -19,7 +19,7 @@
     Note: the tag will be pushed automatically.
     
     ``` shell
-    git switch master
+    git switch main
     ./mvnw release:clean
     ./mvnw release:prepare
     ```