diff --git a/sources/src/main/java/io/akarin/api/internal/Akari.java b/sources/src/main/java/io/akarin/api/internal/Akari.java
index aad20ac6b..0cb02ba6e 100644
--- a/sources/src/main/java/io/akarin/api/internal/Akari.java
+++ b/sources/src/main/java/io/akarin/api/internal/Akari.java
@@ -81,6 +81,12 @@ public abstract class Akari {
         }
     }
     
+    private static final String serverVersion = Akari.class.getPackage().getImplementationVersion();
+    
+    public static String getServerVersion() {
+        return serverVersion + " (MC: " + MinecraftServer.getServer().getVersion() + ")";
+    }
+    
     /*
      * Timings
      */
diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinCraftServer.java b/sources/src/main/java/io/akarin/server/mixin/core/MixinCraftServer.java
index 5a4d10db9..1495abda1 100644
--- a/sources/src/main/java/io/akarin/server/mixin/core/MixinCraftServer.java
+++ b/sources/src/main/java/io/akarin/server/mixin/core/MixinCraftServer.java
@@ -14,8 +14,10 @@ import net.minecraft.server.MinecraftServer;
 @Mixin(value = CraftServer.class, remap = false)
 public abstract class MixinCraftServer {
     @Shadow @Final @Mutable private String serverName;
+    @Shadow @Final @Mutable private String serverVersion;
     @Shadow @Final protected MinecraftServer console;
     private boolean needApplyServerName = true;
+    private boolean needApplyServerVersion = true;
     
     @Overwrite
     public String getName() {
@@ -28,6 +30,15 @@ public abstract class MixinCraftServer {
         return serverName;
     }
     
+    @Overwrite
+    public String getVersion() {
+        if (needApplyServerVersion) {
+            serverVersion = AkarinGlobalConfig.serverBrandName.equals(Akari.EMPTY_STRING) ? serverVersion : serverVersion.replace("Akarin", AkarinGlobalConfig.serverBrandName);
+            needApplyServerVersion = false;
+        }
+        return serverVersion + " (MC: " + console.getVersion() + ")";
+    }
+    
     @Overwrite
     public boolean isPrimaryThread() {
         return Akari.isPrimaryThread();
diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinVersionCommand.java b/sources/src/main/java/io/akarin/server/mixin/core/MixinVersionCommand.java
index e6bf75f1e..aac72754d 100644
--- a/sources/src/main/java/io/akarin/server/mixin/core/MixinVersionCommand.java
+++ b/sources/src/main/java/io/akarin/server/mixin/core/MixinVersionCommand.java
@@ -104,7 +104,7 @@ public abstract class MixinVersionCommand {
             versionWaiters.add(sender);
             sender.sendMessage("Checking version, please wait...");
             
-            String version = Bukkit.getVersion();
+            String version = Akari.getServerVersion();
             if (version == null) {
                 version = "Unique"; // Custom - > Unique
                 customVersion = true;