diff --git a/src/main/java/com/comandante/creeper/Main.java b/src/main/java/com/comandante/creeper/Main.java
index b13ba6f86b5b9867c2fd0f3437deb106725139bd..9b1707c74d5ef4bd9fe7271e1b9bc86d46b670e4 100644
--- a/src/main/java/com/comandante/creeper/Main.java
+++ b/src/main/java/com/comandante/creeper/Main.java
@@ -27,10 +27,8 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Properties;
-import java.util.Set;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
@@ -52,8 +50,14 @@ public class Main {
             return "0";
         }
         String buildVersion = props.getProperty("build.version");
-        String buildTimestamp = props.getProperty("build.timestamp");
-        return buildVersion + " " + buildTimestamp;
+        long buildTimestamp = Long.parseLong(props.getProperty("build.timestamp"));
+        Date date = new Date(buildTimestamp);
+        SimpleDateFormat format = new SimpleDateFormat();
+        String dateFormatted = format.format(date);
+        if (buildVersion == null) {
+            return "creeper-local-dev";
+        }
+        return buildVersion + " " + dateFormatted;
     }
     public static void main(String[] args) throws Exception {
 
diff --git a/src/main/java/com/comandante/creeper/command/admin/SystemInfo.java b/src/main/java/com/comandante/creeper/command/admin/SystemInfo.java
index 3c8d89b2c7729070f1f5df0aa839cdd7a219c503..72fc123f087173ff4005162d4b069806896b4708 100644
--- a/src/main/java/com/comandante/creeper/command/admin/SystemInfo.java
+++ b/src/main/java/com/comandante/creeper/command/admin/SystemInfo.java
@@ -1,5 +1,6 @@
 package com.comandante.creeper.command.admin;
 
+import com.comandante.creeper.Main;
 import com.comandante.creeper.command.Command;
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.PlayerRole;
@@ -64,6 +65,11 @@ public class SystemInfo extends Command {
                     .append("uptime:")
                     .append(Color.RESET)
                     .append(upTime)
+                    .append(" | ")
+                    .append(Color.MAGENTA)
+                    .append("build:")
+                    .append(Color.RESET)
+                    .append(Main.getCreeperVersion())
                     .append("\r\n").toString());
         } finally {
             super.messageReceived(ctx, e);