diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 103b7e003..0000e6bf8 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -324,7 +324,7 @@
             <property name="message" value="Redundant ''static'' modifier."/>
         </module>
         <module name="RegexpSinglelineJava">
-            <property name="format" value="(\/\/TODO)|(\/\/ TODO:)|(\/\/ TODO\(\))|(\/\/ TODO\(.*+\):[^ ])|(\/\/ TODO\(.*+\)[^:])|(\/\/ TODO\(.*[\s\(\)]+.*\):)"/>
+            <property name="format" value="\/\/TODO|\/\/ TODO(?!\([^()\s]+\): )"/>
             <property name="message" value="TODO format: // TODO(flastname): explanation"/>
         </module>
         <module name="RegexpSinglelineJava">
diff --git a/build.gradle b/build.gradle
index 93365ebef..50347d0f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
         classpath 'com.netflix.nebula:nebula-dependency-recommender:5.2.0'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:5.1.4'
-        classpath 'com.palantir.baseline:gradle-baseline-java:0.19.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:0.20.1'
         classpath 'com.palantir.configurationresolver:gradle-configuration-resolver-plugin:0.3.0'
     }
 }
diff --git a/versions.props b/versions.props
index 4c185de3f..ef98703cb 100644
--- a/versions.props
+++ b/versions.props
@@ -3,7 +3,7 @@ com.google.errorprone:error_prone_annotations = 2.3.1
 com.google.errorprone:error_prone_core = 2.0.19
 com.google.errorprone:error_prone_test_helpers = 2.0.19
 com.google.guava:guava = 21.0
-com.palantir.baseline:* = 0.19.0
+com.palantir.baseline:* = 0.20.1
 com.palantir.safe-logging:* = 1.4.0
 org.slf4j:slf4j-api = 1.7.24
 net.ltgt.gradle:gradle-errorprone-plugin = 0.0.14