diff --git a/build.gradle b/build.gradle
index a5ad8a99c..a229f0e04 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'org.kordamp:markdown-gradle-plugin:1.0.0'
-		classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.1.0'
+		classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.2.0'
     }
 }
 apply plugin: 'org.kordamp.gradle.markdown'
@@ -283,8 +283,7 @@ subprojects {
 	}
 
 	clirr {
-		baseline = [group, name, clirrBaseline].join(':')
-		failOnErrors clirrFailOnErrors
+		semver false
 	}
 }
 
@@ -297,7 +296,7 @@ subprojects*.jar {
 // Important to specify this task after the subprojects block
 task clirrRootReport(type: org.kordamp.gradle.clirr.ClirrReportTask) {
 	dependsOn = subprojects.tasks.clirr
-	reports = files(subprojects.tasks.clirr.xmlReport)
+	reports = files((subprojects.findAll { it.clirr.enabled == true }).tasks.clirr.xmlReport)
 }
 
 def getGitCommit() {
diff --git a/version.gradle b/version.gradle
index 0c944602b..f9f03001b 100644
--- a/version.gradle
+++ b/version.gradle
@@ -4,10 +4,5 @@ allprojects {
 		isSnapshot = true
 		jxmppVersion = '0.4.2-beta1'
 		smackMinAndroidSdk = 8
-
-		// The baseline version to check the API's binary
-		// compatibility against with Clirr.
-		clirrBaseline = '4.1.0-rc2'
-		clirrFailOnErrors = false
 	}
 }