diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b22fd1a315..023bec98f1 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,10 +1,10 @@
 # Release notes #
 
-### 2.11.4 (not yet released) ###
+### 2.11.4 (2020-04-01) ###
 
 * Text:
-  * Catch-and-log all fatal exceptions in `TextRenderer` instead of re-throwing,
-    allowing playback to continue even if subtitles fail
+  * Catch and log exceptions in `TextRenderer` rather than re-throwing. This
+    allows playback to continue even if subtitle decoding fails
     ([#6885](https://github.com/google/ExoPlayer/issues/6885)).
   * Allow missing hours and milliseconds in SubRip (.srt) timecodes
     ([#7122](https://github.com/google/ExoPlayer/issues/7122)).
@@ -18,7 +18,7 @@
     ([#7134](https://github.com/google/ExoPlayer/issues/7134)).
   * Fix failure to play WAV files that contain trailing non-media bytes
     ([#7129](https://github.com/google/ExoPlayer/issues/7129))
-* DASH: 
+* DASH:
     * Update the manifest URI to avoid repeated HTTP redirects
       ([#6907](https://github.com/google/ExoPlayer/issues/6907)).
     * Parse period `AssetIdentifier` elements.
@@ -27,7 +27,7 @@
   ([#6761](https://github.com/google/ExoPlayer/issues/6761)).
 * Analytics: Fix `PlaybackStatsListener` behavior when not keeping history
   ([#7160](https://github.com/google/ExoPlayer/issues/7160)).
-* FFmpeg extension: Add support for x86_64.
+* FFmpeg extension: Add support for `x86_64` architecture.
 * Opus extension: Fix parsing of negative gain values
   ([#7046](https://github.com/google/ExoPlayer/issues/7046)).
 
diff --git a/constants.gradle b/constants.gradle
index e29e5cb7c8..c79130cacb 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.11.3'
-    releaseVersionCode = 2011003
+    releaseVersion = '2.11.4'
+    releaseVersionCode = 2011004
     minSdkVersion = 16
     appTargetSdkVersion = 29
     targetSdkVersion = 28 // TODO: Bump once b/143232359 is resolved
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
index 51d077270a..06743732e7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
@@ -29,11 +29,11 @@ public final class ExoPlayerLibraryInfo {
 
   /** The version of the library expressed as a string, for example "1.2.3". */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa.
-  public static final String VERSION = "2.11.3";
+  public static final String VERSION = "2.11.4";
 
   /** The version of the library expressed as {@code "ExoPlayerLib/" + VERSION}. */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final String VERSION_SLASHY = "ExoPlayerLib/2.11.3";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.11.4";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -43,7 +43,7 @@ public final class ExoPlayerLibraryInfo {
    * integer version 123045006 (123-045-006).
    */
   // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
-  public static final int VERSION_INT = 2011003;
+  public static final int VERSION_INT = 2011004;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}