diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 66140067f0..7549ab7fe7 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -53,6 +53,7 @@
         `EventListener.onMediaMetadataChanged`.
     *   Fix bug when transitions from content to ad periods called
         `onMediaItemTransition` by mistake.
+    *   Deprecate `ExoPlayer.Builder`. Use `SimpleExoPlayer.Builder` instead.
 *   UI:
     *   Add builder for `PlayerNotificationManager`.
     *   Add group setting to `PlayerNotificationManager`.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index 32e711c971..c01ca86c71 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -60,7 +60,7 @@ import java.util.List;
 
 /**
  * An extensible media player that plays {@link MediaSource}s. Instances can be obtained from {@link
- * SimpleExoPlayer.Builder} or {@link ExoPlayer.Builder}.
+ * SimpleExoPlayer.Builder}.
  *
  * <h3>Player components</h3>
  *
@@ -73,11 +73,11 @@ import java.util.List;
  * <ul>
  *   <li><b>{@link MediaSource MediaSources}</b> that define the media to be played, load the media,
  *       and from which the loaded media can be read. MediaSources are created from {@link MediaItem
- *       MediaItems} by the {@link MediaSourceFactory} injected in the {@link
- *       Builder#setMediaSourceFactory Builder}, or can be added directly by methods like {@link
- *       #setMediaSource(MediaSource)}. The library provides a {@link DefaultMediaSourceFactory} for
- *       progressive media files, DASH, SmoothStreaming and HLS, including functionality for
- *       side-loading subtitle files and clipping media.
+ *       MediaItems} by the {@link MediaSourceFactory} injected into the player {@link
+ *       SimpleExoPlayer.Builder#setMediaSourceFactory Builder}, or can be added directly by methods
+ *       like {@link #setMediaSource(MediaSource)}. The library provides a {@link
+ *       DefaultMediaSourceFactory} for progressive media files, DASH, SmoothStreaming and HLS,
+ *       which also includes functionality for side-loading subtitle files and clipping media.
  *   <li><b>{@link Renderer}</b>s that render individual components of the media. The library
  *       provides default implementations for common media types ({@link MediaCodecVideoRenderer},
  *       {@link MediaCodecAudioRenderer}, {@link TextRenderer} and {@link MetadataRenderer}). A
@@ -523,7 +523,10 @@ public interface ExoPlayer extends Player {
    * A builder for {@link ExoPlayer} instances.
    *
    * <p>See {@link #Builder(Context, Renderer...)} for the list of default values.
+   *
+   * @deprecated Use {@link SimpleExoPlayer.Builder} instead.
    */
+  @Deprecated
   final class Builder {
 
     private final Renderer[] renderers;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 5d42f8c0a0..fa9261835b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -59,9 +59,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-/**
- * An {@link ExoPlayer} implementation. Instances can be obtained from {@link ExoPlayer.Builder}.
- */
+/** An {@link ExoPlayer} implementation. */
 /* package */ final class ExoPlayerImpl extends BasePlayer implements ExoPlayer {
 
   private static final String TAG = "ExoPlayerImpl";