diff --git a/app/src/main/res/raw/changelog.md b/app/src/main/res/raw/changelog.md
index f5f5a408e..38c3ac12f 100644
--- a/app/src/main/res/raw/changelog.md
+++ b/app/src/main/res/raw/changelog.md
@@ -1,8 +1,8 @@
+## v8.0.7
+
+- Fix sepolicy rule migration when upgrading
+
 ## v8.0.6
 
 - Minor UI changes
 - Update internal scripts
-
-## v8.0.5
-
-- Fix sepolicy rule copying
diff --git a/docs/app_changes.md b/docs/app_changes.md
index 686d30526..81f12a413 100644
--- a/docs/app_changes.md
+++ b/docs/app_changes.md
@@ -1,10 +1,18 @@
 # Magisk Manager Changelog
 
-### v8.0.5
+### v8.0.7
+
+- Fix sepolicy rule migration when upgrading
+
+### v8.0.6
 
 - Minor UI changes
 - Update internal scripts
 
+### v8.0.5
+
+- Fix sepolicy rule copying
+
 ### v8.0.4
 
 - A lot of stability changes and minor bug fixes
diff --git a/docs/changes.md b/docs/changes.md
index 947fd4044..7f9f258e5 100644
--- a/docs/changes.md
+++ b/docs/changes.md
@@ -1,5 +1,10 @@
 # Magisk Changelog
 
+### v21.4
+
+- [MagiskSU] Fix `su -c` behavior that broke many root apps
+- [General] Properly handle read/write over sockets (the `broken pipe` issue)
+
 ### v21.3
 
 - [MagiskInit] Avoid mounting `f2fs` userdata as it may result in kernel crashes. This shall fix a lot of bootloops
diff --git a/docs/releases/21300.md b/docs/releases/21400.md
similarity index 74%
rename from docs/releases/21300.md
rename to docs/releases/21400.md
index 8b89978e0..b5008a4aa 100644
--- a/docs/releases/21300.md
+++ b/docs/releases/21400.md
@@ -1,7 +1,14 @@
-## 2021.1.16 Magisk v21.3
+## 2021.1.17 Magisk v21.4
+
+**Update**: v21.4 adds more regression hot fixes.
 
 Happy 2021! v21.3 adds a workaround for devices with buggy F2FS Linux kernel drivers. This F2FS bug may cause bootloops on many devices. Checkout the full [v21.0 release notes](https://topjohnwu.github.io/Magisk/releases/21000.html) if coming from older releases.
 
+### v21.4
+
+- [MagiskSU] Fix `su -c` behavior that broke many root apps
+- [General] Properly handle read/write over sockets (the `broken pipe` issue)
+
 ### v21.3
 
 - [MagiskInit] Avoid mounting `f2fs` userdata as it may result in kernel crashes. This shall fix a lot of bootloops
diff --git a/gradle.properties b/gradle.properties
index 341ede36d..8e3fcc573 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,6 +27,6 @@ android.injected.testOnly=false
 kapt.incremental.apt=true
 
 # Magisk
-magisk.versionCode=21304
+magisk.versionCode=21400
 magisk.ndkVersion=21d
 magisk.fullNdkVersion=21.3.6528147