diff --git a/app/src/main/java/org/lineageos/updater/UpdateImporter.java b/app/src/main/java/org/lineageos/updater/UpdateImporter.java
index 2503f6f8643a6e4e100ef9b7a6cc04147be50cd9..ebd1bceb3559354e29f0fcb7494e3b834275ec49 100644
--- a/app/src/main/java/org/lineageos/updater/UpdateImporter.java
+++ b/app/src/main/java/org/lineageos/updater/UpdateImporter.java
@@ -247,7 +247,7 @@ public class UpdateImporter {
             case Build.VERSION_CODES.TIRAMISU -> "13";
             case Build.VERSION_CODES.UPSIDE_DOWN_CAKE -> "14";
             case Build.VERSION_CODES.VANILLA_ICE_CREAM -> "15";
-            case Build.VERSION_CODES.BAKLAVA -> "16";
+            case 36 -> "16"; // Build.VERSION_CODES.BAKLAVA
             default -> Build.VERSION.RELEASE;
         };
     }
diff --git a/app/src/main/java/org/lineageos/updater/misc/BuildInfoUtils.java b/app/src/main/java/org/lineageos/updater/misc/BuildInfoUtils.java
index 6a647faf2517460c8cd0084a87e285dfddb68b1d..de004dd0f2464a7757dca72867aa619dc2f15438 100644
--- a/app/src/main/java/org/lineageos/updater/misc/BuildInfoUtils.java
+++ b/app/src/main/java/org/lineageos/updater/misc/BuildInfoUtils.java
@@ -26,6 +26,10 @@ public final class BuildInfoUtils {
         return SystemProperties.getLong(Constants.PROP_BUILD_DATE, 0);
     }
 
+    public static String getBuildId() {
+        return SystemProperties.get(Constants.PROP_BUILD_ID);
+    }
+
     public static String getBuildVersion() {
         return SystemProperties.get(Constants.PROP_BUILD_VERSION);
     }
diff --git a/app/src/main/java/org/lineageos/updater/misc/Constants.java b/app/src/main/java/org/lineageos/updater/misc/Constants.java
index 80bae99de8adaef0dbf53717c283b9543c0c0921..dfa24da2b2e0b5b9569052d80b2750bdc4f886b8 100644
--- a/app/src/main/java/org/lineageos/updater/misc/Constants.java
+++ b/app/src/main/java/org/lineageos/updater/misc/Constants.java
@@ -52,6 +52,7 @@ public final class Constants {
     public static final String PROP_AB_DEVICE = "ro.build.ab_update";
     public static final String PROP_ALLOW_MAJOR_UPGRADES = "lineage.updater.allow_major_upgrades";
     public static final String PROP_BUILD_DATE = "ro.build.date.utc";
+    public static final String PROP_BUILD_ID = "ro.build.id";
     public static final String PROP_BUILD_VERSION = "ro.lineage.build.version";
     public static final String PROP_BUILD_DISPLAY_VERSION = "ro.lineage.display.version";
     public static final String PROP_BUILD_VERSION_INCREMENTAL = "ro.build.version.incremental";
diff --git a/app/src/main/java/org/lineageos/updater/misc/Utils.java b/app/src/main/java/org/lineageos/updater/misc/Utils.java
index 141b6a7f87a98246be961c2f792d3b0cb9b89abe..5a70f6ff1220282ee76fed022eb067cdc9fa645c 100644
--- a/app/src/main/java/org/lineageos/updater/misc/Utils.java
+++ b/app/src/main/java/org/lineageos/updater/misc/Utils.java
@@ -307,7 +307,22 @@ public class Utils {
 
     public static String getChangelogURL(Context context) {
         String buildVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION);
-        return context.getString(R.string.e_menu_changelog_url, buildVersion, Build.VERSION.RELEASE);
+        return context.getString(R.string.e_menu_changelog_url, buildVersion, getChangeLogVersion());
+    }
+
+    private static String getChangeLogVersion() {
+        if (Build.VERSION.SDK_INT == 36) { // Build.VERSION_CODES.BAKLAVA
+            String buildId = BuildInfoUtils.getBuildId().toLowerCase();
+            if (buildId.startsWith("bp4a")) {
+                return "a16.2";
+            } else if (buildId.startsWith("bp3a")) {
+                return "a16.1";
+            } else {
+                return "a16"; // first release
+            }
+        }
+
+        return "a" + Build.VERSION.RELEASE;
     }
 
     public static void triggerUpdate(Context context, String downloadId) {
diff --git a/app/src/main/res/values/e_strings.xml b/app/src/main/res/values/e_strings.xml
index f9b53263f5b3185e960511125745e3ce91f15f0c..09708627f76b3a508834d11e2e2346efa48a422b 100644
--- a/app/src/main/res/values/e_strings.xml
+++ b/app/src/main/res/values/e_strings.xml
@@ -18,7 +18,7 @@
     <!-- URLs -->
     <string name="e_updater_server_url" translatable="false">https://ota.ecloud.global/api/v1/{device}/{type}/{incr}</string>
     <string name="e_ota_staging_server_url" translatable="false">https://test.ota.ecloud.global/api/v1/{device}/{type}/{incr}</string>
-    <string name="e_menu_changelog_url" translatable="false">https://gitlab.e.foundation/e/os/releases/-/releases/v<xliff:g id="build_version">%1$s</xliff:g>-a<xliff:g id="android_version">%2$s</xliff:g></string>
+    <string name="e_menu_changelog_url" translatable="false">https://gitlab.e.foundation/e/os/releases/-/releases/v<xliff:g id="build_version">%1$s</xliff:g>-<xliff:g id="android_version">%2$s</xliff:g></string>
 
     <!-- Notifications -->
     <string name="e_download_completed_notification">Update is ready to be installed</string>