diff --git a/app/build.gradle b/app/build.gradle
index e15b3b8d..f8cd2112 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,6 +29,10 @@ android {
     buildTypes {
         debug {
             versionNameSuffix "-debug"
+            manifestPlaceholders = [crashlyticsEnabled:false]
+        }
+        release {
+            manifestPlaceholders = [crashlyticsEnabled:true]
         }
     }
     lintOptions {
@@ -71,7 +75,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-core:16.0.6'
     def playServicesVersion = "16.1.2"
     implementation "com.google.android.gms:play-services-cast-framework:$playServicesVersion"
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.7'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.8'
     implementation 'com.jakewharton.timber:timber:4.7.0'
     implementation 'commons-io:commons-io:2.6'
     implementation 'net.danlew:android.joda:2.9.9.4'
@@ -97,7 +101,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.4@aar'
     implementation 'com.squareup.picasso:picasso:2.71828'
-    implementation 'com.google.android.exoplayer:exoplayer:2.8.1'
+    implementation 'com.google.android.exoplayer:exoplayer:2.9.3'
     def roomVersion = '2.0.0'
     implementation "androidx.room:room-runtime:$roomVersion"
     kapt "androidx.room:room-compiler:$roomVersion"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e93c7892..fa690cf0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,6 +49,11 @@
         android:value="com.stevenschoen.putionew.cast.CastOptionsProvider"
         />
 
+    <meta-data
+        android:name="firebase_crashlytics_collection_enabled"
+        android:value="${crashlyticsEnabled}"
+        />
+
     <activity
         android:name=".PutioActivity"
         android:label="@string/putio"