diff --git a/app/src/main/res/raw/changelog.md b/app/src/main/res/raw/changelog.md
index d00ede3f1..f2ab9bcd7 100644
--- a/app/src/main/res/raw/changelog.md
+++ b/app/src/main/res/raw/changelog.md
@@ -1,3 +1,8 @@
+## v8.0.4
+
+- A lot of stability changes and minor bug fixes
+- Collect device properties, app logcat, and Magisk logs when saving logs in the logs menu
+
 ## v8.0.3
 
 - Switch to the new Magisk Module Repo setup in preparation to allow 3rd party repos
diff --git a/docs/app_changes.md b/docs/app_changes.md
index 69f682443..df0f8f022 100644
--- a/docs/app_changes.md
+++ b/docs/app_changes.md
@@ -1,5 +1,10 @@
 # Magisk Manager Changelog
 
+### v8.0.4
+
+- A lot of stability changes and minor bug fixes
+- Collect device properties, app logcat, and Magisk logs when saving logs in the logs menu
+
 ### v8.0.3
 
 - Switch to the new Magisk Module Repo setup in preparation to allow 3rd party repos
diff --git a/docs/changes.md b/docs/changes.md
index d1451a173..d72899eed 100644
--- a/docs/changes.md
+++ b/docs/changes.md
@@ -1,5 +1,14 @@
 # Magisk Changelog
 
+### v21.2
+
+- [MagiskInit] Detect 2SI after mounting `system_root` on legacy SAR devices
+- [General] Make sure `post-fs-data` scripts cannot block more than 35 seconds
+- [General] Fix the `magisk --install-module` command
+- [General] Trim Windows newline when reading files
+- [General] Directly log to file to prevent `logcat` weirdness
+- [MagiskBoot] Fix header dump/load for header v3 images
+
 ### v21.1
 
 - [MagiskBoot] Support boot header v3 (Pixel 5 and 4a 5G)
diff --git a/docs/releases/21200.md b/docs/releases/21200.md
new file mode 100644
index 000000000..5339dcdd3
--- /dev/null
+++ b/docs/releases/21200.md
@@ -0,0 +1,14 @@
+## 2020.12.28 Magisk v21.2
+
+v21.2 is a maintenance update, mostly addressing bugs, and expanding device compatibility. Checkout the full [v21.0 release notes](https://topjohnwu.github.io/Magisk/releases/21000.html) if coming from older releases.
+
+### v21.2
+
+- [MagiskInit] Detect 2SI after mounting `system_root` on legacy SAR devices
+- [General] Make sure `post-fs-data` scripts cannot block more than 35 seconds
+- [General] Fix the `magisk --install-module` command
+- [General] Trim Windows newline when reading files
+- [General] Directly log to file to prevent `logcat` weirdness
+- [MagiskBoot] Fix header dump/load for header v3 images
+
+### Full Changelog: [here](https://topjohnwu.github.io/Magisk/changes.html)
diff --git a/gradle.properties b/gradle.properties
index 092a707ad..169cd3e64 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,6 +27,6 @@ android.injected.testOnly=false
 kapt.incremental.apt=true
 
 # Magisk
-magisk.versionCode=21102
+magisk.versionCode=21200
 magisk.ndkVersion=21d
 magisk.fullNdkVersion=21.3.6528147