diff --git a/build.gradle b/build.gradle
index 074e3e5811..140ceb1653 100644
--- a/build.gradle
+++ b/build.gradle
@@ -448,7 +448,7 @@ task detektBaseline(type: JavaExec) {
     main = "io.gitlab.arturbosch.detekt.cli.Main"
     classpath = configurations.detekt
     def input = "$projectDir"
-    def config = "$projectDir/detekt-config.yml"
+    def config = "$projectDir/detekt-config.yml, $projectDir/detekt-baseline-config.yml"
     def baseline = "$projectDir/detekt-baseline.xml"
     def params = ['-i', input, '-c', config, '-b', baseline, '--create-baseline']
     args(params)
diff --git a/detekt-baseline-config.yml b/detekt-baseline-config.yml
new file mode 100644
index 0000000000..05b7b01b04
--- /dev/null
+++ b/detekt-baseline-config.yml
@@ -0,0 +1,6 @@
+#Detekt 1.0.1
+#Gradle task detektBaseline would always fail due to the fact that the existing baseline would not be taken into
+#account so existing issues flare up. We set the max issues allowed to a high number to force detekt to pass when
+#generating a baseline.
+build:
+  maxIssues: 9999999
\ No newline at end of file