diff --git a/CHANGELOG.md b/CHANGELOG.md
index 229ef09f1..fc4170ee5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
-### 13.6 (2023-09-17)
+### 13.6 (2023-10-07)
 
 * Change priority with multi-select [#2257](https://github.com/tasks/tasks/pull/2452) - @vulewuxe86
 * Automatically select newly copied tasks [#2246](https://github.com/tasks/tasks/pull/2446) - @vulewuxe86
 * Reduce minimum size for widgets [#2436](https://github.com/tasks/tasks/pull/2436) - @histefanhere
+* Replace deprecated method call [#2526](https://github.com/tasks/tasks/pull/2526) - @kmj-99
 * Improve handling text shared to Tasks [#2485](https://github.com/tasks/tasks/issues/2485)
 * Use notification audio stream for completion sound
 * Notification preference 'More settings' opens channel settings directly
@@ -15,11 +16,16 @@
   * Catalan - Joan Montané
   * Chinese (Simplified) - Poesty Li
   * Chinese (Traditional) - @abc0922001
-  * German - @qwerty287, deep map
+  * Dutch - @fvbommel
+  * French - @FlorianLeChat
+  * German - @qwerty287, deep map, @franconian
+  * Hungarian - Kaci
   * Italian - @ppasserini
   * Japanese - Kazushi Hayama, Naga
+  * Spanish - @FlorianLeChat
   * Swedish - @Anaemix, @bittin
-  * Turkish - @emintufan
+  * Turkish - @emintufan, @oersen
+  * Ukrainian - @IhorHordiichuk
 
 ### 13.5.1 (2023-08-02)
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0bc138e33..fbe9124a7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -55,7 +55,7 @@ android {
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 130600
+        versionCode = 130601
         versionName = "13.6"
         targetSdk = 33
         minSdk = 24
diff --git a/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.kt b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.kt
index 5c781b2c0..2f8b349c4 100644
--- a/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.kt
+++ b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.kt
@@ -1,15 +1,15 @@
 package org.tasks.widget
 
-import android.app.Activity
-import android.content.Intent
-import android.content.Intent.ShortcutIconResource
 import android.os.Bundle
-import android.os.Parcelable
 import android.view.View
 import android.widget.TextView
 import androidx.appcompat.widget.Toolbar
+import androidx.core.content.pm.ShortcutInfoCompat
+import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.graphics.drawable.IconCompat
 import com.google.android.material.textfield.TextInputEditText
 import com.todoroo.astrid.api.Filter
+import com.todoroo.astrid.helper.UUIDHelper
 import dagger.hilt.android.AndroidEntryPoint
 import org.tasks.R
 import org.tasks.Strings.isNullOrEmpty
@@ -124,13 +124,15 @@ class ShortcutConfigActivity : ThemedInjectingAppCompatActivity(), ColorPaletteP
 
     private fun save() {
         val filterId = defaultFilterProvider.getFilterPreferenceValue(selectedFilter!!)
-        val shortcutIntent = TaskIntents.getTaskListByIdIntent(this, filterId)
-        val icon: Parcelable = ShortcutIconResource.fromContext(this, ThemeColor.ICONS[themeIndex])
-        val intent = Intent("com.android.launcher.action.INSTALL_SHORTCUT")
-        intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent)
-        intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, getShortcutName())
-        intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, icon)
-        setResult(Activity.RESULT_OK, intent)
+        ShortcutManagerCompat.requestPinShortcut(
+            this,
+            ShortcutInfoCompat.Builder(this, UUIDHelper.newUUID())
+                .setShortLabel(getShortcutName())
+                .setIntent(TaskIntents.getTaskListByIdIntent(this, filterId))
+                .setIcon(IconCompat.createWithResource(this, ThemeColor.ICONS[themeIndex]))
+                .build(),
+            null,
+        )
         finish()
     }
 
diff --git a/fastlane/metadata/android/en-US/changelogs/130600.txt b/fastlane/metadata/android/en-US/changelogs/130601.txt
similarity index 87%
rename from fastlane/metadata/android/en-US/changelogs/130600.txt
rename to fastlane/metadata/android/en-US/changelogs/130601.txt
index 8a94533eb..d985272a4 100644
--- a/fastlane/metadata/android/en-US/changelogs/130600.txt
+++ b/fastlane/metadata/android/en-US/changelogs/130601.txt
@@ -1,9 +1,11 @@
 * Change priority with multi-select - @vulewuxe86
 * Automatically select newly copied tasks - @vulewuxe86
 * Reduce minimum size for widgets - @histefanhere
+* Replace deprecated method call - @kmj-99
 * Improve handling text shared to Tasks
 * Use notification audio stream for completion sound
 * Notification preference 'More settings' opens channel settings directly
 * Respect 'New tasks on top' preference when creating subtasks
 * Automatically add due dates for recurring tasks
+* Fix crash on startup
 * Update translations