diff --git a/FIXED_UPSTREAM_ISSUES.md b/FIXED_UPSTREAM_ISSUES.md
new file mode 100644
index 000000000..588e6db1a
--- /dev/null
+++ b/FIXED_UPSTREAM_ISSUES.md
@@ -0,0 +1,15 @@
+## Fixed upstream issues
+
+### Modpacks
+
+- Cannot launch MC Eternal[(CatServer#904)](https://github.com/Luohuayu/CatServer/issues/904)
+
+### Forge-Bukkit
+
+- Some mod explosions cannot be handled by Bukkit plugins(e.g. Tinkers' Construct EFLN)
+
+### Mods
+
+- Simple Difficulty(And any other similar mods) thirst is not getting reset on player respawn[(Luohuayu/CatServer#536)](https://github.com/Luohuayu/CatServer/issues/536)[(MohistMC/Mohist#2905)](https://github.com/MohistMC/Mohist/issues/2905)
+
+**All fixes have been contributed to the upstream project.**
\ No newline at end of file
diff --git a/README.md b/README.md
index 155e4c7c3..e899e6269 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,8 @@ CatRoom is a Cleanroom+Bukkit+Spigot server software forked from [CatServer](htt
 - Make use of modern Java features
 - Optimized plugin performance
 
+For all fixes, see [fixed upstream issues](FIXED_UPSTREAM_ISSUES.md)
+
 ## Components:
 
 - Minecraft Coder Pack
diff --git a/src/main/java/catserver/server/CatServer.java b/src/main/java/catserver/server/CatServer.java
index 00ecc9f64..29a7b18e2 100644
--- a/src/main/java/catserver/server/CatServer.java
+++ b/src/main/java/catserver/server/CatServer.java
@@ -13,6 +13,7 @@
 
 public class CatServer {
     public static final Logger log = LogManager.getLogger("CatServer");
+    public static final boolean DISABLE_PERMISSION_BRIDGE = Boolean.getBoolean("catserver.disablePermissionBridge");
     private static final String version = "2.1.0";
     private static final String native_version = "v1_12_R1";
 
diff --git a/src/main/java/net/minecraftforge/fml/common/Loader.java b/src/main/java/net/minecraftforge/fml/common/Loader.java
index 3801f273f..fe5e84716 100644
--- a/src/main/java/net/minecraftforge/fml/common/Loader.java
+++ b/src/main/java/net/minecraftforge/fml/common/Loader.java
@@ -629,7 +629,7 @@ public void preinitializeMods()
         GameData.fireCreateRegistryEvents();
         ObjectHolderRegistry.INSTANCE.findObjectHolders(discoverer.getASMTable());
         ItemStackHolderInjector.INSTANCE.findHolders(discoverer.getASMTable());
-        net.minecraftforge.server.permission.PermissionAPI.setPermissionHandler(new catserver.server.permission.BukkitForgePermissionHandler()); // CatRoom - Permission bridge
+        if (!catserver.server.CatServer.DISABLE_PERMISSION_BRIDGE) net.minecraftforge.server.permission.PermissionAPI.setPermissionHandler(new catserver.server.permission.BukkitForgePermissionHandler()); // CatRoom - Permission bridge
         CapabilityManager.INSTANCE.injectCapabilities(discoverer.getASMTable());
         modController.distributeStateMessage(LoaderState.PREINITIALIZATION, discoverer.getASMTable(), canonicalConfigDir);
         GameData.fireRegistryEvents(rl -> !rl.equals(GameData.RECIPES));