diff --git a/pom.xml b/pom.xml
index 57b05e8f1d..230c8a5036 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,7 +211,7 @@
         <version.auto-value>1.11.0</version.auto-value>
         <version.error-prone>${version.error-prone-orig}</version.error-prone>
         <version.error-prone-fork>v${version.error-prone-orig}-picnic-1</version.error-prone-fork>
-        <version.error-prone-orig>2.35.1</version.error-prone-orig>
+        <version.error-prone-orig>2.36.0</version.error-prone-orig>
         <version.error-prone-slf4j>0.1.28</version.error-prone-slf4j>
         <version.guava-beta-checker>1.0</version.guava-beta-checker>
         <version.jdk>17</version.jdk>
@@ -1962,12 +1962,6 @@
                                     <!-- XXX: Enable this once we open-source
                                     this library. -->
                                     -Xep:BetaApi:OFF
-                                    <!-- This check flags bad member names, but
-                                    also type names that we may want to accept.
-                                    Consider contributing a flag to toggle this
-                                    behavior. See
-                                    https://github.com/google/error-prone/issues/4616 -->
-                                    -Xep:IdentifierName:OFF
                                     <!-- We don't target JDK 7. -->
                                     -Xep:Java7ApiChecker:OFF
                                     <!-- We don't target JDK 8. -->
@@ -1983,6 +1977,9 @@
                                     <!-- XXX: Enable once there are fewer
                                     false-positives.
                                     -XepOpt:CheckReturnValue:CheckAllMethods=true -->
+                                    <!-- XXX: Consider renaming flagged types
+                                    instead. -->
+                                    -XepOpt:IdentifierName:AllowInitialismsInTypeName=true
                                     -XepOpt:InlineMe:SkipInliningsWithComments=false
                                     -XepOpt:NullAway:AnnotatedPackages=tech.picnic
                                     -XepOpt:NullAway:AssertsEnabled=true
@@ -1997,11 +1994,18 @@
                                 </arg>
                                 <!-- The Error Prone plugin makes certain
                                 assumptions about the state of the AST at the
-                                moment it is invoked. Those assumptions are met
-                                when using the `simple` compile policy. This
-                                flag may be dropped after resolution of
+                                moment it is invoked. Those assumptions require
+                                the `simple` compile policy. This flag may be
+                                dropped after resolution of
                                 https://bugs.openjdk.java.net/browse/JDK-8155674. -->
                                 <arg>-XDcompilePolicy=simple</arg>
+                                <!-- Similarly, Error Prone requires that flow
+                                analysis has been performed, e.g. to determine
+                                whether variables are effectively final. This
+                                flag may be dropped if it ever becomes the
+                                default. See
+                                https://bugs.openjdk.org/browse/JDK-8134117. -->
+                                <arg>--should-stop=ifError=FLOW</arg>
                             </compilerArgs>
                         </configuration>
                     </plugin>
diff --git a/website/_data/compatibility.yml b/website/_data/compatibility.yml
index 9a24428029..bf6a4efe0b 100644
--- a/website/_data/compatibility.yml
+++ b/website/_data/compatibility.yml
@@ -3,6 +3,7 @@
 releases:
   - version: 0.19.1
     compatible:
+      - "2.36.0"
       - "2.35.1"
       - "2.35.0"
       - "2.34.0"
@@ -12,6 +13,7 @@ releases:
       - "2.30.0"
   - version: 0.19.0
     compatible:
+      - "2.36.0"
       - "2.35.1"
       - "2.35.0"
       - "2.34.0"
@@ -21,6 +23,7 @@ releases:
       - "2.30.0"
   - version: 0.18.0
     compatible:
+      - "2.36.0"
       - "2.35.1"
       - "2.35.0"
       - "2.34.0"
diff --git a/website/generate-version-compatibility-overview.sh b/website/generate-version-compatibility-overview.sh
index 7513a035d8..c0716db6f5 100755
--- a/website/generate-version-compatibility-overview.sh
+++ b/website/generate-version-compatibility-overview.sh
@@ -45,6 +45,13 @@ for eps_version in ${eps_versions}; do
   (set +u && echo n | sdk install maven "${mvn_version}")
   sdk use maven "${mvn_version}"
 
+  # As of version 2.36.0, Error Prone requires that the
+  # `--should-stop=ifError=FLOW` flag is provided. Make sure that this flag is
+  # always specified. (The `-XDcompilePolicy=simple` flag has been specified
+  # since the first Error Prone Support release. It's okay if the added flag is
+  # present more than once; the last variant listed wins.)
+  sed -i 's,<arg>-XDcompilePolicy=simple</arg>,<arg>-XDcompilePolicy=simple</arg><arg>--should-stop=ifError=FLOW</arg>,' pom.xml
+
   # Collect the list of checks supported by this version of Error Prone
   # Support.
   # XXX: Conditionally omit the `MethodReferenceUsage` exclusion once that