diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 8bea7b5e18..174da6899f 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,9 +1,12 @@
 # Release notes
 
 ### dev-v2 (not yet released)
+
 *   Core Library:
     *   Move `com.google.android.exoplayer2.device.DeviceInfo` to
         `com.google.android.exoplayer2.DeviceInfo`.
+    *   Move `com.google.android.exoplayer2.drm.DecryptionException` to
+        `com.google.android.exoplayer2.decoder.DecryptionException`.
     *   Make `ExoPlayer.Builder` return a `SimpleExoPlayer` instance.
     *   Deprecate `SimpleExoPlayer.Builder`. Use `ExoPlayer.Builder` instead.
 *   Android 12 compatibility:
diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java
index f6da031a7a..9005755cd6 100644
--- a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java
+++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java
@@ -23,9 +23,9 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.audio.OpusUtil;
 import com.google.android.exoplayer2.decoder.CryptoInfo;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
+import com.google.android.exoplayer2.decoder.DecryptionException;
 import com.google.android.exoplayer2.decoder.SimpleDecoder;
 import com.google.android.exoplayer2.decoder.SimpleOutputBuffer;
-import com.google.android.exoplayer2.drm.DecryptionException;
 import com.google.android.exoplayer2.drm.ExoMediaCrypto;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
index 7e8eedb210..07c5a8700b 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
@@ -23,8 +23,8 @@ import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.decoder.CryptoInfo;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
+import com.google.android.exoplayer2.decoder.DecryptionException;
 import com.google.android.exoplayer2.decoder.SimpleDecoder;
-import com.google.android.exoplayer2.drm.DecryptionException;
 import com.google.android.exoplayer2.drm.ExoMediaCrypto;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java b/library/common/src/main/java/com/google/android/exoplayer2/decoder/DecryptionException.java
similarity index 95%
rename from library/common/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java
rename to library/common/src/main/java/com/google/android/exoplayer2/decoder/DecryptionException.java
index eddaba3d93..0737cc47a5 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/decoder/DecryptionException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.drm;
+package com.google.android.exoplayer2.decoder;
 
 /** Thrown when a non-platform component fails to decrypt data. */
 public class DecryptionException extends Exception {