diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7a5a0f..b9ee5ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.3.6]
+### Fixed
+- Fix BREAKING CHANGE regex to also accept BREAKING-CHANGE and BREAKING_CHANGE due to an incompatibility between the Conventional commit specification and the git trailers convention:
+git trailers only detect keywords which do not contain space character (e.g. BREAKING-CHANGE is detected but not BREAKING CHANGE) whereas Conventional commit specification specified BREAKING CHANGE with a space.
+
 ## [2.3.5]
 ### Fixed
 - Fix large process outputs could lead to a timeout in the command runner due to the reading buffer running full and blocking the process.
diff --git a/README.md b/README.md
index a6c9fbf..70cbbe0 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Gradle 2.1 and higher
 
 ```
 plugins {
-    id("io.wusa.semver-git-plugin").version("2.3.5")
+    id("io.wusa.semver-git-plugin").version("2.3.6")
 }
 ```
 
@@ -25,7 +25,7 @@ buildscript {
        }
    }
    dependencies {
-      classpath 'io.wusa:semver-git-plugin:2.3.5'
+      classpath 'io.wusa:semver-git-plugin:2.3.6'
    }
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 3418fb7..efa6671 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "io.wusa"
-version = "2.3.5"
+version = "2.3.6"
 
 dependencies {
     implementation(kotlin("stdlib-jdk8"))
diff --git a/src/main/kotlin/io/wusa/incrementer/ConventionalCommitsIncrementer.kt b/src/main/kotlin/io/wusa/incrementer/ConventionalCommitsIncrementer.kt
index 841cde2..d5a7f84 100644
--- a/src/main/kotlin/io/wusa/incrementer/ConventionalCommitsIncrementer.kt
+++ b/src/main/kotlin/io/wusa/incrementer/ConventionalCommitsIncrementer.kt
@@ -16,7 +16,7 @@ class ConventionalCommitsIncrementer: IIncrementer {
         val optionalScope   = "(\\(.*?\\))?"
         val feat            = "^feat$optionalScope"
         val fix             = "^fix$optionalScope"
-        val breakingChange  = "\\bBREAKING CHANGE\\b:"
+        val breakingChange = "\\bBREAKING[ _-]CHANGE\\b:"
 
         if (semverGitPluginExtension.info.dirty) patch = 1